har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/thd: fix special stereo support

Browse Source
This commit is contained in:
Paul B Mahol 2021-11-18 15:12:20 +01:00
parent 8718f8cfaf
commit a8a7c5d502
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mlpdec.c
View File

@ -408,7 +408,9 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
mh.stream_type);
return AVERROR_PATCHWELCOME;
}
if (mh.channel_modifier_thd_stream0 == THD_CH_MODIFIER_STEREO)
if (mh.channels_thd_stream1 == 2 &&
mh.channels_thd_stream2 == 2 &&
m->avctx->channels == 2)
m->substream[0].mask = AV_CH_LAYOUT_STEREO;
if ((substr = (mh.num_substreams > 1)))
m->substream[0].mask = AV_CH_LAYOUT_STEREO;

2
libavcodec/mlpenc.c
View File

@ -626,7 +626,7 @@ static av_cold int mlp_encode_init(AVCodecContext *avctx)
ctx->ch_modifier_thd0 = 0;
ctx->ch_modifier_thd1 = 0;
ctx->ch_modifier_thd2 = 0;
ctx->channel_arrangement = 0;
ctx->channel_arrangement = 1;
break;
case AV_CH_LAYOUT_5POINT0_BACK:
ctx->ch_modifier_thd0 = 1;