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

Merge commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1'

Browse Source 
* commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1':
  mlp_parser: account for AVCodecContext.request_channels when setting the channel layout.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-23 16:34:34 +01:00
commit 86b892af19
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/mlp_parser.c
View File

@ -328,11 +328,23 @@ static int mlp_parse(AVCodecParserContext *s,
if(!avctx->channels || !avctx->channel_layout) { if(!avctx->channels || !avctx->channel_layout) {
if (mh.stream_type == 0xbb) { if (mh.stream_type == 0xbb) {
/* MLP stream */ /* MLP stream */
avctx->channels = mh.channels_mlp; if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
avctx->channel_layout = mh.channel_layout_mlp; mh.num_substreams > 1) {
avctx->channels = 2;
avctx->channel_layout = AV_CH_LAYOUT_STEREO;
} else {
avctx->channels = mh.channels_mlp;
avctx->channel_layout = mh.channel_layout_mlp;
}
} else { /* mh.stream_type == 0xba */ } else { /* mh.stream_type == 0xba */
/* TrueHD stream */ /* TrueHD stream */
if (mh.channels_thd_stream2) { if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
mh.num_substreams > 1) {
avctx->channels = 2;
avctx->channel_layout = AV_CH_LAYOUT_STEREO;
} else if (mh.channels_thd_stream2 &&
(avctx->request_channels <= 0 ||
avctx->request_channels > mh.channels_thd_stream1)) {
avctx->channels = mh.channels_thd_stream2; avctx->channels = mh.channels_thd_stream2;
avctx->channel_layout = mh.channel_layout_thd_stream2; avctx->channel_layout = mh.channel_layout_thd_stream2;
} else { } else {