diff options
| author | Alex Converse <alex.converse@gmail.com> | 2017-02-09 08:57:33 -0800 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2017-02-13 09:31:13 -0800 |
| commit | 20ea8bf9390b3a68e43bbe666154aa8b5150cad3 (patch) | |
| tree | 8aba84af0e7dddd87ef8b2843453853254322c18 /libavcodec/aacdec.c | |
| parent | 3f1a38c9194d0d1e47469504000997b7bfbcf3b0 (diff) | |
| download | ffmpeg-20ea8bf9390b3a68e43bbe666154aa8b5150cad3.tar.gz | |
aac_latm: Copy whole AudioSpecificConfig when it is sized.
This preserves sync extensions.
Diffstat (limited to 'libavcodec/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 709ac7cdf8..08d92fe145 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -289,17 +289,19 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx, int sync_extension = 0; int bits_consumed, esize, i; - if (asclen) { + if (asclen > 0) { sync_extension = 1; asclen = FFMIN(asclen, get_bits_left(gb)); - } else - asclen = get_bits_left(gb); - - if (asclen <= 0) + init_get_bits(&gbc, gb->buffer, config_start_bit + asclen); + skip_bits_long(&gbc, config_start_bit); + } else if (asclen == 0) { + gbc = *gb; + } else { return AVERROR_INVALIDDATA; + } - init_get_bits(&gbc, gb->buffer, config_start_bit + asclen); - skip_bits_long(&gbc, config_start_bit); + if (get_bits_left(gb) <= 0) + return AVERROR_INVALIDDATA; bits_consumed = decode_audio_specific_config_gb(NULL, avctx, &m4ac, &gbc, config_start_bit, @@ -309,6 +311,9 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx, return AVERROR_INVALIDDATA; bits_consumed -= config_start_bit; + if (asclen == 0) + asclen = bits_consumed; + if (!latmctx->initialized || ac->oc[1].m4ac.sample_rate != m4ac.sample_rate || ac->oc[1].m4ac.chan_config != m4ac.chan_config) { @@ -320,7 +325,7 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx, } latmctx->initialized = 0; - esize = (bits_consumed+7) / 8; + esize = (asclen + 7) / 8; if (avctx->extradata_size < esize) { av_free(avctx->extradata); @@ -336,9 +341,9 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx, } memset(avctx->extradata+esize, 0, AV_INPUT_BUFFER_PADDING_SIZE); } - skip_bits_long(gb, bits_consumed); + skip_bits_long(gb, asclen); - return bits_consumed; + return 0; } static int read_stream_mux_config(struct LATMContext *latmctx, @@ -379,8 +384,6 @@ static int read_stream_mux_config(struct LATMContext *latmctx, int ascLen = latm_get_value(gb); if ((ret = latm_decode_audio_specific_config(latmctx, gb, ascLen)) < 0) return ret; - ascLen -= ret; - skip_bits_long(gb, ascLen); } latmctx->frame_length_type = get_bits(gb, 3); |