diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-31 23:24:53 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-01 00:07:31 +0100 |
commit | 4478e9d8db65ca827f2b3ef3ef6ee806bffdba45 (patch) | |
tree | 795fe15fd00d5682450ca31aa25ecaf7fc0c3ee1 /libavcodec/mpegaudiodec.c | |
parent | 2cba62bd84d15e84633b982f868fb1e50834c0d8 (diff) | |
parent | febd022228660cb4b4d0e7b108bfec339b7dce92 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add tests for dfa
mpegaudiodec: fix seeking.
mpegaudiodec: fix compilation when testing the unchecked bitstream reader
threads: add sysconf based number of CPUs detection
threads: always include necessary headers for number of CPUs detection
threads: default to automatic thread count detection
Changelog: restore version <next> header
cook: K&R formatting cosmetics
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudiodec.c')
-rw-r--r-- | libavcodec/mpegaudiodec.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 1bfccb427e..69232ed9b6 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -1436,28 +1436,30 @@ static int mp_decode_layer3(MPADecodeContext *s) memcpy(s->last_buf + s->last_buf_size, ptr, EXTRABYTES); s->in_gb = s->gb; init_get_bits(&s->gb, s->last_buf, s->last_buf_size*8); -#if CONFIG_SAFE_BITSTREAM_READER +#if !UNCHECKED_BITSTREAM_READER s->gb.size_in_bits_plus8 += EXTRABYTES * 8; #endif - skip_bits_long(&s->gb, 8*(s->last_buf_size - main_data_begin)); - } - - for (gr = 0; gr < nb_granules; gr++) { - for (ch = 0; ch < s->nb_channels; ch++) { - g = &s->granules[ch][gr]; - if (get_bits_count(&s->gb) < 0) { - av_log(s->avctx, AV_LOG_DEBUG, "mdb:%d, lastbuf:%d skipping granule %d\n", - main_data_begin, s->last_buf_size, gr); - skip_bits_long(&s->gb, g->part2_3_length); + s->last_buf_size <<= 3; + for (gr = 0, ch = 0; gr < nb_granules && (s->last_buf_size >> 3) < main_data_begin; gr++, ch = 0) { + for (; ch < s->nb_channels && (s->last_buf_size >> 3) < main_data_begin; ch++) { + g = &s->granules[ch][gr]; + s->last_buf_size += g->part2_3_length; memset(g->sb_hybrid, 0, sizeof(g->sb_hybrid)); - if (get_bits_count(&s->gb) >= s->gb.size_in_bits && s->in_gb.buffer) { - skip_bits_long(&s->in_gb, get_bits_count(&s->gb) - s->gb.size_in_bits); - s->gb = s->in_gb; - s->in_gb.buffer = NULL; - } - continue; } + } + skip_bits_long(&s->gb, s->last_buf_size - 8 * main_data_begin); + if (get_bits_count(&s->gb) >= s->gb.size_in_bits && s->in_gb.buffer) { + skip_bits_long(&s->in_gb, get_bits_count(&s->gb) - s->gb.size_in_bits); + s->gb = s->in_gb; + s->in_gb.buffer = NULL; + } + } else { + gr = ch = 0; + } + for (; gr < nb_granules; gr++, ch = 0) { + for (; ch < s->nb_channels; ch++) { + g = &s->granules[ch][gr]; bits_pos = get_bits_count(&s->gb); if (!s->lsf) { |