diff options
Diffstat (limited to 'libavcodec/mpeg4audio.c')
-rw-r--r-- | libavcodec/mpeg4audio.c | 90 |
1 files changed, 56 insertions, 34 deletions
diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index e321bcc..2197147 100644 --- a/libavcodec/mpeg4audio.c +++ b/libavcodec/mpeg4audio.c @@ -3,20 +3,20 @@ * Copyright (c) 2008 Baptiste Coudurier <baptiste.coudurier@free.fr> * Copyright (c) 2009 Alex Converse <alex.converse@gmail.com> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -42,6 +42,11 @@ static int parse_config_ALS(GetBitContext *gb, MPEG4AudioConfig *c) // which are buggy in old ALS conformance files c->sample_rate = get_bits_long(gb, 32); + if (c->sample_rate <= 0) { + av_log(NULL, AV_LOG_ERROR, "Invalid sample rate %d\n", c->sample_rate); + return AVERROR_INVALIDDATA; + } + // skip number of samples skip_bits_long(gb, 32); @@ -52,6 +57,8 @@ static int parse_config_ALS(GetBitContext *gb, MPEG4AudioConfig *c) return 0; } +/* XXX: make sure to update the copies in the different encoders if you change + * this table */ const int avpriv_mpeg4audio_sample_rates[16] = { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350 @@ -76,63 +83,62 @@ static inline int get_sample_rate(GetBitContext *gb, int *index) avpriv_mpeg4audio_sample_rates[*index]; } -int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, - int bit_size, int sync_extension) +int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb, + int sync_extension) { - GetBitContext gb; int specific_config_bitindex, ret; - - ret = init_get_bits(&gb, buf, bit_size); - if (ret < 0) - return ret; - c->object_type = get_object_type(&gb); - c->sample_rate = get_sample_rate(&gb, &c->sampling_index); - c->chan_config = get_bits(&gb, 4); + int start_bit_index = get_bits_count(gb); + c->object_type = get_object_type(gb); + c->sample_rate = get_sample_rate(gb, &c->sampling_index); + c->chan_config = get_bits(gb, 4); if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels)) c->channels = ff_mpeg4audio_channels[c->chan_config]; c->sbr = -1; c->ps = -1; if (c->object_type == AOT_SBR || (c->object_type == AOT_PS && // check for W6132 Annex YYYY draft MP3onMP4 - !(show_bits(&gb, 3) & 0x03 && !(show_bits(&gb, 9) & 0x3F)))) { + !(show_bits(gb, 3) & 0x03 && !(show_bits(gb, 9) & 0x3F)))) { if (c->object_type == AOT_PS) c->ps = 1; c->ext_object_type = AOT_SBR; c->sbr = 1; - c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index); - c->object_type = get_object_type(&gb); + c->ext_sample_rate = get_sample_rate(gb, &c->ext_sampling_index); + c->object_type = get_object_type(gb); if (c->object_type == AOT_ER_BSAC) - c->ext_chan_config = get_bits(&gb, 4); + c->ext_chan_config = get_bits(gb, 4); } else { c->ext_object_type = AOT_NULL; c->ext_sample_rate = 0; } - specific_config_bitindex = get_bits_count(&gb); + specific_config_bitindex = get_bits_count(gb); if (c->object_type == AOT_ALS) { - skip_bits(&gb, 5); - if (show_bits_long(&gb, 24) != MKBETAG('\0','A','L','S')) - skip_bits_long(&gb, 24); + skip_bits(gb, 5); + if (show_bits_long(gb, 24) != MKBETAG('\0','A','L','S')) + skip_bits_long(gb, 24); - specific_config_bitindex = get_bits_count(&gb); + specific_config_bitindex = get_bits_count(gb); - ret = parse_config_ALS(&gb, c); + ret = parse_config_ALS(gb, c); if (ret < 0) return ret; } if (c->ext_object_type != AOT_SBR && sync_extension) { - while (get_bits_left(&gb) > 15) { - if (show_bits(&gb, 11) == 0x2b7) { // sync extension - get_bits(&gb, 11); - c->ext_object_type = get_object_type(&gb); - if (c->ext_object_type == AOT_SBR && (c->sbr = get_bits1(&gb)) == 1) - c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index); - if (get_bits_left(&gb) > 11 && get_bits(&gb, 11) == 0x548) - c->ps = get_bits1(&gb); + while (get_bits_left(gb) > 15) { + if (show_bits(gb, 11) == 0x2b7) { // sync extension + get_bits(gb, 11); + c->ext_object_type = get_object_type(gb); + if (c->ext_object_type == AOT_SBR && (c->sbr = get_bits1(gb)) == 1) { + c->ext_sample_rate = get_sample_rate(gb, &c->ext_sampling_index); + if (c->ext_sample_rate == c->sample_rate) + c->sbr = -1; + } + if (get_bits_left(gb) > 11 && get_bits(gb, 11) == 0x548) + c->ps = get_bits1(gb); break; } else - get_bits1(&gb); // skip 1 bit + get_bits1(gb); // skip 1 bit } } @@ -143,5 +149,21 @@ int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, if ((c->ps == -1 && c->object_type != AOT_AAC_LC) || c->channels & ~0x01) c->ps = 0; - return specific_config_bitindex; + return specific_config_bitindex - start_bit_index; +} + +int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, + int bit_size, int sync_extension) +{ + GetBitContext gb; + int ret; + + if (bit_size <= 0) + return AVERROR_INVALIDDATA; + + ret = init_get_bits(&gb, buf, bit_size); + if (ret < 0) + return ret; + + return ff_mpeg4audio_get_config_gb(c, &gb, sync_extension); } |