[FFmpeg-devel] [RFC]TrueHD 7.1

[Carl Eugen Hoyos]

Carl Eugen Hoyos <cehoyos <at> ag.or.at> writes:

> +++ b/libavcodec/mlpdec.c
> @@ -435,6 +435,10 @@ static int read_restart_header(MLPDecodeContext *m,
GetBitContext *gbp,
>          }
>          s->ch_assign[ch_assign] = ch;
>      }
> +    if (m->avctx->channel_layout == AV_CH_LAYOUT_7POINT1) {
> +        FFSWAP(int, s->ch_assign[4], s->ch_assign[6]);
> +        FFSWAP(int, s->ch_assign[5], s->ch_assign[7]);

I applied a variant of this patch.

TrueHD 7.1 is now decoded correctly by FFmpeg, MPlayer still fails because
avctx->channel_layout isn't set.

Carl Eugen