generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mlp: improve request_channel_layout behavior.

Browse Source 
Don't decode further substreams if request_channel_layout
is a subset of the current substream's channel_layout.

Before, we would only discard further substreams if
request_channel_layout matched the substream's
channel_layout extactly, thus decoding additional
channels which the caller would probably end up downmixing.
This commit is contained in:
Tim Walker
2014-02-06 21:50:38 +00:00
parent 5c1c6e8226
commit c0c45188e5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mlp_parser.c
View File

@@ -362,8 +362,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
mh.num_substreams > 1) {
avctx->channels = 2;
avctx->channel_layout = AV_CH_LAYOUT_STEREO;
} else if (avctx->request_channel_layout == mh.channel_layout_thd_stream1 ||
!mh.channels_thd_stream2) {
} else if (!mh.channels_thd_stream2 ||
(mh.channel_layout_thd_stream1 & avctx->request_channel_layout) ==
avctx->request_channel_layout) {
avctx->channels = mh.channels_thd_stream1;
avctx->channel_layout = mh.channel_layout_thd_stream1;
} else {