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

Merge commit '94c54d97e7f4fe90570c323803f2bdf6246c1010'

Browse Source 
* commit '94c54d97e7f4fe90570c323803f2bdf6246c1010':
  mlp: Factor out channel layout subset checks

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-30 16:52:36 -03:00
commit e3ebc293c6
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

@ -119,6 +119,11 @@ uint64_t ff_truehd_layout(int chanmap)
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)
{
int has_extension, extensions = 0;
@ -341,6 +346,8 @@ static int mlp_parse(AVCodecParserContext *s,
} else {
GetBitContext gb;
MLPHeaderInfo mh;
int stereo_requested = ff_mlp_channel_layout_subset(avctx->request_channel_layout,
AV_CH_LAYOUT_STEREO);
init_get_bits(&gb, buf + 4, (buf_size - 4) << 3);
if (ff_mlp_read_major_sync(avctx, &mh, &gb) < 0)
@ -357,10 +364,7 @@ static int mlp_parse(AVCodecParserContext *s,
if(!avctx->channels || !avctx->channel_layout) {
if (mh.stream_type == 0xbb) {
/* MLP stream */
if (avctx->request_channel_layout &&
(avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) ==
avctx->request_channel_layout &&
mh.num_substreams > 1) {
if (stereo_requested && mh.num_substreams > 1) {
avctx->channels = 2;
avctx->channel_layout = AV_CH_LAYOUT_STEREO;
} else {
@ -369,16 +373,12 @@ static int mlp_parse(AVCodecParserContext *s,
}
} else { /* mh.stream_type == 0xba */
/* TrueHD stream */
if (avctx->request_channel_layout &&
(avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) ==
avctx->request_channel_layout &&
mh.num_substreams > 1) {
if (stereo_requested && mh.num_substreams > 1) {
avctx->channels = 2;
avctx->channel_layout = AV_CH_LAYOUT_STEREO;
} else if (!mh.channels_thd_stream2 ||
(avctx->request_channel_layout &&
(avctx->request_channel_layout & mh.channel_layout_thd_stream1) ==
avctx->request_channel_layout)) {
ff_mlp_channel_layout_subset(avctx->request_channel_layout,
mh.channel_layout_thd_stream1)) {
avctx->channels = mh.channels_thd_stream1;
avctx->channel_layout = mh.channel_layout_thd_stream1;
} else {

2
libavcodec/mlp_parser.h
View File

@ -68,4 +68,6 @@ uint64_t ff_truehd_layout(int chanmap);
extern const uint64_t ff_mlp_layout[32];
int ff_mlp_channel_layout_subset(uint64_t channel_layout, uint64_t mask);
#endif /* AVCODEC_MLP_PARSER_H */

4
libavcodec/mlpdec.c
View File

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