Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '1f6e5dd4d4dd9c02371ad211049d27edb6d95286'

Browse Source 
* commit '1f6e5dd4d4dd9c02371ad211049d27edb6d95286':
  mlp: Rename the channel layout variable

Merged-by: James Almer <jamrial@gmail.com>
pull/272/head
James Almer 7 years ago
parent 21525e6d0d 1f6e5dd4d4
commit 8b63acaeee
1 changed files with 13 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      libavcodec/mlpdec.c

26
libavcodec/mlpdec.c
Unescape View File

@ -66,7 +66,7 @@ typedef struct SubStream {
/// For each channel output by the matrix, the output channel to map it to /// For each channel output by the matrix, the output channel to map it to
uint8_t ch_assign[MAX_CHANNELS]; uint8_t ch_assign[MAX_CHANNELS];
/// The channel layout for this substream /// The channel layout for this substream
uint64_t ch_layout; uint64_t mask;
/// The matrix encoding mode for this substream /// The matrix encoding mode for this substream
enum AVMatrixEncoding matrix_encoding; enum AVMatrixEncoding matrix_encoding;
@ -390,8 +390,8 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
if ((substr = (mh.num_substreams > 1))) if ((substr = (mh.num_substreams > 1)))
m->substream[0].ch_layout = AV_CH_LAYOUT_STEREO; m->substream[0].mask = AV_CH_LAYOUT_STEREO;
m->substream[substr].ch_layout = mh.channel_layout_mlp; m->substream[substr].mask = mh.channel_layout_mlp;
} else { } else {
if (mh.stream_type != 0xba) { if (mh.stream_type != 0xba) {
avpriv_request_sample(m->avctx, avpriv_request_sample(m->avctx,
@ -400,15 +400,15 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
if ((substr = (mh.num_substreams > 1))) if ((substr = (mh.num_substreams > 1)))
m->substream[0].ch_layout = AV_CH_LAYOUT_STEREO; m->substream[0].mask = AV_CH_LAYOUT_STEREO;
if (mh.num_substreams > 2) if (mh.num_substreams > 2)
if (mh.channel_layout_thd_stream2) if (mh.channel_layout_thd_stream2)
m->substream[2].ch_layout = mh.channel_layout_thd_stream2; m->substream[2].mask = mh.channel_layout_thd_stream2;
else else
m->substream[2].ch_layout = mh.channel_layout_thd_stream1; m->substream[2].mask = mh.channel_layout_thd_stream1;
m->substream[substr].ch_layout = mh.channel_layout_thd_stream1; m->substream[substr].mask = mh.channel_layout_thd_stream1;
if (m->avctx->channels<=2 && m->substream[substr].ch_layout == AV_CH_LAYOUT_MONO && m->max_decoded_substream == 1) { if (m->avctx->channels<=2 && m->substream[substr].mask == AV_CH_LAYOUT_MONO && m->max_decoded_substream == 1) {
av_log(m->avctx, AV_LOG_DEBUG, "Mono stream with 2 substreams, ignoring 2nd\n"); av_log(m->avctx, AV_LOG_DEBUG, "Mono stream with 2 substreams, ignoring 2nd\n");
m->max_decoded_substream = 0; m->max_decoded_substream = 0;
if (m->avctx->channels==2) if (m->avctx->channels==2)
@ -533,12 +533,12 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
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->ch_layout & m->avctx->request_channel_layout) == if (m->avctx->request_channel_layout && (s->mask & m->avctx->request_channel_layout) ==
m->avctx->request_channel_layout && m->max_decoded_substream > substr) { m->avctx->request_channel_layout && 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",
s->max_channel + 1, s->ch_layout, substr); s->max_channel + 1, s->mask, substr);
m->max_decoded_substream = substr; m->max_decoded_substream = substr;
} }
@ -565,9 +565,9 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
for (ch = 0; ch <= s->max_matrix_channel; ch++) { for (ch = 0; ch <= s->max_matrix_channel; ch++) {
int ch_assign = get_bits(gbp, 6); int ch_assign = get_bits(gbp, 6);
if (m->avctx->codec_id == AV_CODEC_ID_TRUEHD) { if (m->avctx->codec_id == AV_CODEC_ID_TRUEHD) {
uint64_t channel = thd_channel_layout_extract_channel(s->ch_layout, uint64_t channel = thd_channel_layout_extract_channel(s->mask,
ch_assign); ch_assign);
ch_assign = av_get_channel_layout_channel_index(s->ch_layout, ch_assign = av_get_channel_layout_channel_index(s->mask,
channel); channel);
} }
if (ch_assign < 0 || ch_assign > s->max_matrix_channel) { if (ch_assign < 0 || ch_assign > s->max_matrix_channel) {
@ -609,7 +609,7 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
if (substr == m->max_decoded_substream) { if (substr == m->max_decoded_substream) {
m->avctx->channels = s->max_matrix_channel + 1; m->avctx->channels = s->max_matrix_channel + 1;
m->avctx->channel_layout = s->ch_layout; m->avctx->channel_layout = s->mask;
m->dsp.mlp_pack_output = m->dsp.mlp_select_pack_output(s->ch_assign, m->dsp.mlp_pack_output = m->dsp.mlp_select_pack_output(s->ch_assign,
s->output_shift, s->output_shift,
s->max_matrix_channel, s->max_matrix_channel,

Write Preview
Loading…
Cancel
Save