diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-01-25 20:07:06 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-28 03:15:32 +0100 |
| commit | e732af87fc00efb1fe6d1e1fd6610c75d911bf6f (patch) | |
| tree | 93845176e29a699611ed544874abeba712aef9a4 /libavcodec | |
| parent | 97e528a9e1b09a30db192e1a6f2d90c7643a1d5a (diff) | |
| download | ffmpeg-e732af87fc00efb1fe6d1e1fd6610c75d911bf6f.tar.gz | |
ac3: Remove ff_ac3_critical_band_size_tab.
It is only used to generate band_start_tab, which about the same size, at
runtime, so it's simpler just to always hardcode band_start_tab.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 24e3ad3031fa26e12d4b939f0ff0dd6e12f05ef5)
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ac3.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c index a8b4e0b268..8fa60e67d5 100644 --- a/libavcodec/ac3.c +++ b/libavcodec/ac3.c @@ -28,8 +28,6 @@ #include "ac3.h" #include "get_bits.h" -#if CONFIG_HARDCODED_TABLES - /** * Starting frequency coefficient bin for each critical band. */ @@ -41,6 +39,8 @@ static const uint8_t band_start_tab[AC3_CRITICAL_BANDS+1] = { 79, 85, 97, 109, 121, 133, 157, 181, 205, 229, 253 }; +#if CONFIG_HARDCODED_TABLES + /** * Map each frequency coefficient bin to the critical band that contains it. */ @@ -70,13 +70,6 @@ static const uint8_t bin_to_band_tab[253] = { }; #else /* CONFIG_HARDCODED_TABLES */ -static const uint8_t ff_ac3_critical_band_size_tab[AC3_CRITICAL_BANDS]={ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, - 3, 6, 6, 6, 6, 6, 6, 12, 12, 12, 12, 24, 24, 24, 24, 24 -}; - -static uint8_t band_start_tab[51]; static uint8_t bin_to_band_tab[253]; #endif @@ -251,14 +244,12 @@ void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end, av_cold void ac3_common_init(void) { #if !CONFIG_HARDCODED_TABLES - /* compute bndtab and masktab from bandsz */ + /* compute bin_to_band_tab from band_start_tab */ int bin = 0, band; for (band = 0; band < AC3_CRITICAL_BANDS; band++) { - int band_end = bin + ff_ac3_critical_band_size_tab[band]; - band_start_tab[band] = bin; + int band_end = band_start_tab[band+1]; while (bin < band_end) bin_to_band_tab[bin++] = band; } - band_start_tab[AC3_CRITICAL_BANDS] = bin; #endif /* !CONFIG_HARDCODED_TABLES */ } |