diff options
| author | Tim Walker <tdskywalker@gmail.com> | 2012-12-31 15:33:23 +0100 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2013-01-22 16:10:02 -0500 |
| commit | 99ccd2ba10eac2b282c272ad9e75f082123c765a (patch) | |
| tree | 83a1ad8f47fdbc3bf7b6be9f951e6524573de7a7 /libavcodec/mlp_parser.h | |
| parent | 73b704ac609d83e0be124589f24efd9b94947cf9 (diff) | |
mlp: store the channel layout for each substream.
Also stop storing the channel arrangement in the header info, as it's unused outside of ff_mlp_read_major_sync.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org
Diffstat (limited to 'libavcodec/mlp_parser.h')
| -rw-r--r-- | libavcodec/mlp_parser.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h index 35bb312f17..24b4169419 100644 --- a/libavcodec/mlp_parser.h +++ b/libavcodec/mlp_parser.h @@ -39,9 +39,12 @@ typedef struct MLPHeaderInfo int group1_samplerate; ///< Sample rate of first substream int group2_samplerate; ///< Sample rate of second substream (MLP only) - int channels_mlp; ///< Channel arrangement for MLP streams - int channels_thd_stream1; ///< Channel arrangement for substream 1 of TrueHD streams (5.1) - int channels_thd_stream2; ///< Channel arrangement for substream 2 of TrueHD streams (7.1) + int channels_mlp; ///< Channel count for MLP streams + int channels_thd_stream1; ///< Channel count for substream 1 of TrueHD streams ("6-channel presentation") + int channels_thd_stream2; ///< Channel count for substream 2 of TrueHD streams ("8-channel presentation") + uint64_t channel_layout_mlp; ///< Channel layout for MLP streams + uint64_t channel_layout_thd_stream1; ///< Channel layout for substream 1 of TrueHD streams ("6-channel presentation") + uint64_t channel_layout_thd_stream2; ///< Channel layout for substream 2 of TrueHD streams ("8-channel presentation") int access_unit_size; ///< Number of samples per coded frame int access_unit_size_pow2; ///< Next power of two above number of samples per frame |