From 4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09 Mon Sep 17 00:00:00 2001 From: Tim Walker Date: Wed, 11 Dec 2013 02:03:32 +0000 Subject: mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for each substream. --- libavcodec/mlpdec.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'libavcodec/mlpdec.c') diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 4339b9dbd5..615abf3cb3 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -60,6 +60,8 @@ typedef struct SubStream { uint8_t ch_assign[MAX_CHANNELS]; /// The channel layout for this substream uint64_t ch_layout; + /// The matrix encoding mode for this substream + enum AVMatrixEncoding matrix_encoding; /// Channel coding parameters for channels in the substream ChannelParams channel_params[MAX_CHANNELS]; @@ -374,6 +376,46 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb) m->substream[substr].ch_layout = mh.channel_layout_thd_stream1; } + /* Parse the TrueHD decoder channel modifiers and set each substream's + * AVMatrixEncoding accordingly. + * + * The meaning of the modifiers depends on the channel layout: + * + * - THD_CH_MODIFIER_LTRT, THD_CH_MODIFIER_LBINRBIN only apply to 2-channel + * + * - THD_CH_MODIFIER_MONO applies to 1-channel or 2-channel (dual mono) + * + * - THD_CH_MODIFIER_SURROUNDEX, THD_CH_MODIFIER_NOTSURROUNDEX only apply to + * layouts with an Ls/Rs channel pair + */ + for (substr = 0; substr < MAX_SUBSTREAMS; substr++) + m->substream[substr].matrix_encoding = AV_MATRIX_ENCODING_NONE; + if (m->avctx->codec_id == AV_CODEC_ID_TRUEHD) { + if (mh.num_substreams > 2 && + mh.channel_layout_thd_stream2 & AV_CH_SIDE_LEFT && + mh.channel_layout_thd_stream2 & AV_CH_SIDE_RIGHT && + mh.channel_modifier_thd_stream2 == THD_CH_MODIFIER_SURROUNDEX) + m->substream[2].matrix_encoding = AV_MATRIX_ENCODING_DOLBYEX; + + if (mh.num_substreams > 1 && + mh.channel_layout_thd_stream1 & AV_CH_SIDE_LEFT && + mh.channel_layout_thd_stream1 & AV_CH_SIDE_RIGHT && + mh.channel_modifier_thd_stream1 == THD_CH_MODIFIER_SURROUNDEX) + m->substream[1].matrix_encoding = AV_MATRIX_ENCODING_DOLBYEX; + + if (mh.num_substreams > 0) + switch (mh.channel_modifier_thd_stream0) { + case THD_CH_MODIFIER_LTRT: + m->substream[0].matrix_encoding = AV_MATRIX_ENCODING_DOLBY; + break; + case THD_CH_MODIFIER_LBINRBIN: + m->substream[0].matrix_encoding = AV_MATRIX_ENCODING_DOLBYHEADPHONE; + break; + default: + break; + } + } + return 0; } -- cgit v1.2.3