har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac3: Remove ff_ac3_critical_band_size_tab.

Browse Source 
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)
This commit is contained in:
Justin Ruggles 2011-01-25 20:07:06 +00:00 committed by Michael Niedermayer
parent 97e528a9e1
commit e732af87fc
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/ac3.c
View File

@ -28,8 +28,6 @@
#include "ac3.h" #include "ac3.h"
#include "get_bits.h" #include "get_bits.h"
#if CONFIG_HARDCODED_TABLES
/** /**
* Starting frequency coefficient bin for each critical band. * 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 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. * 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 */ #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]; static uint8_t bin_to_band_tab[253];
#endif #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) av_cold void ac3_common_init(void)
{ {
#if !CONFIG_HARDCODED_TABLES #if !CONFIG_HARDCODED_TABLES
/* compute bndtab and masktab from bandsz */ /* compute bin_to_band_tab from band_start_tab */
int bin = 0, band; int bin = 0, band;
for (band = 0; band < AC3_CRITICAL_BANDS; band++) { for (band = 0; band < AC3_CRITICAL_BANDS; band++) {
int band_end = bin + ff_ac3_critical_band_size_tab[band]; int band_end = band_start_tab[band+1];
band_start_tab[band] = bin;
while (bin < band_end) while (bin < band_end)
bin_to_band_tab[bin++] = band; bin_to_band_tab[bin++] = band;
} }
band_start_tab[AC3_CRITICAL_BANDS] = bin;
#endif /* !CONFIG_HARDCODED_TABLES */ #endif /* !CONFIG_HARDCODED_TABLES */
} }