mlp_parser: account for AVCodecContext.request_channels when setting the channel layout.
Allows users to configure the output based on what's actually decoded, rather than the full native layout. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
This commit is contained in:

committed by
Justin Ruggles

parent
1fd2deedcc
commit
b0c7e3ffd0
@@ -322,11 +322,23 @@ static int mlp_parse(AVCodecParserContext *s,
|
|||||||
|
|
||||||
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 {
|
||||||
|
Reference in New Issue
Block a user