virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

mlp: Factor out channel layout subset checks

Browse Source
This commit is contained in:
Vittorio Giovara 2017-04-25 16:26:58 -04:00
parent cea7fd9afb
commit 94c54d97e7
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/mlp_parser.c
View File

@ -120,6 +120,11 @@ static uint64_t truehd_layout(int chanmap)
return layout; return layout;
} }
int ff_mlp_channel_layout_subset(uint64_t channel_layout, uint64_t mask)
{
return channel_layout && ((channel_layout & mask) == channel_layout);
}
static int mlp_get_major_sync_size(const uint8_t * buf, int bufsize) static int mlp_get_major_sync_size(const uint8_t * buf, int bufsize)
{ {
int has_extension, extensions = 0; int has_extension, extensions = 0;
@ -331,6 +336,8 @@ static int mlp_parse(AVCodecParserContext *s,
} else { } else {
BitstreamContext bc; BitstreamContext bc;
MLPHeaderInfo mh; MLPHeaderInfo mh;
int stereo_requested = ff_mlp_channel_layout_subset(avctx->request_channel_layout,
AV_CH_LAYOUT_STEREO);
bitstream_init8(&bc, buf + 4, buf_size - 4); bitstream_init8(&bc, buf + 4, buf_size - 4);
if (ff_mlp_read_major_sync(avctx, &mh, &bc) < 0) if (ff_mlp_read_major_sync(avctx, &mh, &bc) < 0)
@ -346,10 +353,7 @@ static int mlp_parse(AVCodecParserContext *s,
if (mh.stream_type == 0xbb) { if (mh.stream_type == 0xbb) {
/* MLP stream */ /* MLP stream */
if (avctx->request_channel_layout && if (stereo_requested && mh.num_substreams > 1) {
(avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) ==
avctx->request_channel_layout &&
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 { } else {
@ -358,16 +362,12 @@ static int mlp_parse(AVCodecParserContext *s,
} }
} else { /* mh.stream_type == 0xba */ } else { /* mh.stream_type == 0xba */
/* TrueHD stream */ /* TrueHD stream */
if (avctx->request_channel_layout && if (stereo_requested && mh.num_substreams > 1) {
(avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) ==
avctx->request_channel_layout &&
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 ||
(avctx->request_channel_layout && ff_mlp_channel_layout_subset(avctx->request_channel_layout,
(avctx->request_channel_layout & mh.channel_layout_thd_stream1) == 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 {

2
libavcodec/mlp_parser.h
View File

@ -63,4 +63,6 @@ typedef struct MLPHeaderInfo
int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, BitstreamContext *bc); int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, BitstreamContext *bc);
int ff_mlp_channel_layout_subset(uint64_t channel_layout, uint64_t mask);
#endif /* AVCODEC_MLP_PARSER_H */ #endif /* AVCODEC_MLP_PARSER_H */

4
libavcodec/mlpdec.c
View File

@ -511,8 +511,8 @@ static int read_restart_header(MLPDecodeContext *m, BitstreamContext *bc,
s->max_channel = max_channel; s->max_channel = max_channel;
s->max_matrix_channel = max_matrix_channel; s->max_matrix_channel = max_matrix_channel;
if (m->avctx->request_channel_layout && (s->mask & m->avctx->request_channel_layout) == if (ff_mlp_channel_layout_subset(m->avctx->request_channel_layout, s->mask) &&
m->avctx->request_channel_layout && m->max_decoded_substream > substr) { m->max_decoded_substream > substr) {
av_log(m->avctx, AV_LOG_DEBUG, av_log(m->avctx, AV_LOG_DEBUG,
"Extracting %d-channel downmix (0x%"PRIx64") from substream %d. " "Extracting %d-channel downmix (0x%"PRIx64") from substream %d. "
"Further substreams will be skipped.\n", "Further substreams will be skipped.\n",