RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '970c76f32283bddf3a5afd24fe52db7a96186244' 

* commit '970c76f32283bddf3a5afd24fe52db7a96186244':
  mlp_parser: Drop in-parser downmix functionality

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-30 17:20:45 -03:00
parent 9484b9f4ba 970c76f322
commit 34542ac033
3 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/mlp_parser.c
View File

@ -119,11 +119,6 @@ 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;
@ -346,8 +341,6 @@ 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)
@ -364,21 +357,11 @@ static int mlp_parse(AVCodecParserContext *s,
if(!avctx->channels || !avctx->channel_layout) {
if (mh.stream_type == 0xbb) {
/* MLP stream */
if (stereo_requested && 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;
}
avctx->channels = mh.channels_mlp;
avctx->channel_layout = mh.channel_layout_mlp;
} else { /* mh.stream_type == 0xba */
/* TrueHD stream */
if (stereo_requested && mh.num_substreams > 1) {
avctx->channels = 2;
avctx->channel_layout = AV_CH_LAYOUT_STEREO;
} else if (!mh.channels_thd_stream2 ||
ff_mlp_channel_layout_subset(avctx->request_channel_layout,
mh.channel_layout_thd_stream1)) {
if (!mh.channels_thd_stream2) {
avctx->channels = mh.channels_thd_stream1;
avctx->channel_layout = mh.channel_layout_thd_stream1;
} else {

2
libavcodec/mlp_parser.h
View File

@ -68,6 +68,4 @@ 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 */

7
libavcodec/mlpdec.c
View File

@ -180,6 +180,11 @@ static const uint64_t thd_channel_order[] = {
AV_CH_LOW_FREQUENCY_2, // LFE2
};
static int mlp_channel_layout_subset(uint64_t channel_layout, uint64_t mask)
{
return channel_layout && ((channel_layout & mask) == channel_layout);
}
static uint64_t thd_channel_layout_extract_channel(uint64_t channel_layout,
int index)
{
@ -533,7 +538,7 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
s->max_channel = max_channel;
s->max_matrix_channel = max_matrix_channel;
if (ff_mlp_channel_layout_subset(m->avctx->request_channel_layout, s->mask) &&
if (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. "