mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
avcodec/ac3: always use hardcoded tables
The table in question is a 253 byte one. In fact, it turns out that dynamic generation of the table results in an increased binary size. Code compiled with GCC 5.2.0, x86-64 (size in bytes), before and after patch: old: 62321064 libavcodec/libavcodec.so.57 new: 62320536 libavcodec/libavcodec.so.57 Thus, it always make sense to statically allocate this. Tested with FATE with/without --enable-hardcoded-tables. Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
This commit is contained in:
parent
5a41a5a4f5
commit
7b11eead1b
@ -39,8 +39,6 @@ const uint8_t ff_ac3_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.
|
||||
*/
|
||||
@ -69,10 +67,6 @@ const uint8_t ff_ac3_bin_to_band_tab[253] = {
|
||||
49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
|
||||
};
|
||||
|
||||
#else /* CONFIG_HARDCODED_TABLES */
|
||||
uint8_t ff_ac3_bin_to_band_tab[253];
|
||||
#endif
|
||||
|
||||
static inline int calc_lowcomp1(int a, int b0, int b1, int c)
|
||||
{
|
||||
if ((b0 + 256) == b1) {
|
||||
@ -214,21 +208,3 @@ int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd,
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialize some tables.
|
||||
* note: This function must remain thread safe because it is called by the
|
||||
* AVParser init code.
|
||||
*/
|
||||
av_cold void ff_ac3_common_init(void)
|
||||
{
|
||||
#if !CONFIG_HARDCODED_TABLES
|
||||
/* compute ff_ac3_bin_to_band_tab from ff_ac3_band_start_tab */
|
||||
int bin = 0, band;
|
||||
for (band = 0; band < AC3_CRITICAL_BANDS; band++) {
|
||||
int band_end = ff_ac3_band_start_tab[band+1];
|
||||
while (bin < band_end)
|
||||
ff_ac3_bin_to_band_tab[bin++] = band;
|
||||
}
|
||||
#endif /* !CONFIG_HARDCODED_TABLES */
|
||||
}
|
||||
|
@ -185,7 +185,6 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
|
||||
|
||||
s->avctx = avctx;
|
||||
|
||||
ff_ac3_common_init();
|
||||
ac3_tables_init();
|
||||
ff_mdct_init(&s->imdct_256, 8, 1, 1.0);
|
||||
ff_mdct_init(&s->imdct_512, 9, 1, 1.0);
|
||||
|
@ -2431,8 +2431,6 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx)
|
||||
|
||||
s->eac3 = avctx->codec_id == AV_CODEC_ID_EAC3;
|
||||
|
||||
ff_ac3_common_init();
|
||||
|
||||
ret = validate_options(s);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
@ -27,12 +27,6 @@
|
||||
#include "libavutil/internal.h"
|
||||
#include "ac3.h"
|
||||
|
||||
#if CONFIG_HARDCODED_TABLES
|
||||
# define HCONST const
|
||||
#else
|
||||
# define HCONST
|
||||
#endif
|
||||
|
||||
extern const uint16_t ff_ac3_frame_size_tab[38][3];
|
||||
extern const uint8_t ff_ac3_channels_tab[8];
|
||||
extern av_export const uint16_t avpriv_ac3_channel_layout_tab[8];
|
||||
@ -54,7 +48,7 @@ extern const int16_t ff_ac3_floor_tab[8];
|
||||
extern const uint16_t ff_ac3_fast_gain_tab[8];
|
||||
extern const uint16_t ff_eac3_default_chmap[8];
|
||||
extern const uint8_t ff_ac3_band_start_tab[AC3_CRITICAL_BANDS+1];
|
||||
extern HCONST uint8_t ff_ac3_bin_to_band_tab[253];
|
||||
extern const uint8_t ff_ac3_bin_to_band_tab[253];
|
||||
|
||||
/** Custom channel map locations bitmask
|
||||
* Other channels described in documentation:
|
||||
|
Loading…
Reference in New Issue
Block a user