RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-12 10:15:22 +00:00
Code Issues Projects Releases Wiki Activity

mlp_parser: fix request_channel_layout behavior.

Browse Source 
When request_channel_layout is 0,
all substreams should be decoded.

Thanks to Michael Niedermayer for spotting.

Also fix a mismatch between the parser and
decoder when request_channel_layout is a
subset of Stereo.
This commit is contained in:
Tim Walker 2014-02-08 17:21:14 +00:00
parent f90a4bfc43
commit c1e7de8f62
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/mlp_parser.c
View File

@ -335,7 +335,9 @@ FF_DISABLE_DEPRECATION_WARNINGS
} else } else
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
if (avctx->request_channel_layout == AV_CH_LAYOUT_STEREO && if (avctx->request_channel_layout &&
(avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) ==
avctx->request_channel_layout &&
mh.num_substreams > 1) { mh.num_substreams > 1) {
avctx->channels = 2; avctx->channels = 2;
avctx->channel_layout = AV_CH_LAYOUT_STEREO; avctx->channel_layout = AV_CH_LAYOUT_STEREO;
@ -358,13 +360,16 @@ FF_DISABLE_DEPRECATION_WARNINGS
} else } else
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
if (avctx->request_channel_layout == AV_CH_LAYOUT_STEREO && if (avctx->request_channel_layout &&
(avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) ==
avctx->request_channel_layout &&
mh.num_substreams > 1) { mh.num_substreams > 1) {
avctx->channels = 2; avctx->channels = 2;
avctx->channel_layout = AV_CH_LAYOUT_STEREO; avctx->channel_layout = AV_CH_LAYOUT_STEREO;
} else if (!mh.channels_thd_stream2 || } else if (!mh.channels_thd_stream2 ||
(mh.channel_layout_thd_stream1 & avctx->request_channel_layout) == (avctx->request_channel_layout &&
avctx->request_channel_layout) { (avctx->request_channel_layout & mh.channel_layout_thd_stream1) ==
avctx->request_channel_layout)) {
avctx->channels = mh.channels_thd_stream1; avctx->channels = mh.channels_thd_stream1;
avctx->channel_layout = mh.channel_layout_thd_stream1; avctx->channel_layout = mh.channel_layout_thd_stream1;
} else { } else {