diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-12-30 01:46:34 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-07 10:28:29 +0100 |
| commit | 698a4b22d09daf592c68b1a044ad22d5a7daf884 (patch) | |
| tree | f4d4623475a7fea5220bd15e59a036527f9995a4 /libavcodec/aacdec_fixed.c | |
| parent | 3044d0efee9136c19dfdcf6dcdf957e910a73fd5 (diff) | |
| download | ffmpeg-698a4b22d09daf592c68b1a044ad22d5a7daf884.tar.gz | |
avcodec/aacdec_fixed: Move fixed-point sinewin tables to its only user
The fixed-point AAC decoder is the only user of the fixed-point sinewin
tables from sinewin; and it only uses a few of them (about 10% when
counting by size). This means that guarding initializing these tables by
an AVOnce (as done in 3719122065863f701026632f610175980d42b05a) is
unnecessary for them. Furthermore the array of pointers to the
individual arrays is also unneeded.
Therefore this commit moves these tables directly into aacdec_fixed.c;
this is done by ridding the original sinewin.h and sinewin_tablegen.h
headers completely of any fixed-point code at the cost of a bit of
duplicated code (the alternative is an ugly ifdef-mess).
This saves about 58KB from the binary when using hardcoded tables (as
these tables are hardcoded in this scenario); when not using hardcoded
tables, most of these savings only affect the .bss segment, but the rest
(< 1KB) contains relocations (i.e. savings in .data.rel.ro).
Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/aacdec_fixed.c')
| -rw-r--r-- | libavcodec/aacdec_fixed.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c index 4d82b7b1aa..c5d923a8b4 100644 --- a/libavcodec/aacdec_fixed.c +++ b/libavcodec/aacdec_fixed.c @@ -70,7 +70,7 @@ #include "fft.h" #include "lpc.h" #include "kbdwin.h" -#include "sinewin.h" +#include "sinewin_fixed_tablegen.h" #include "aac.h" #include "aactab.h" @@ -86,8 +86,8 @@ #include <math.h> #include <string.h> -DECLARE_ALIGNED(32, static int, AAC_KBD_RENAME(kbd_long_1024))[1024]; -DECLARE_ALIGNED(32, static int, AAC_KBD_RENAME(kbd_short_128))[128]; +DECLARE_ALIGNED(32, static int, AAC_RENAME2(aac_kbd_long_1024))[1024]; +DECLARE_ALIGNED(32, static int, AAC_RENAME2(aac_kbd_short_128))[128]; static av_always_inline void reset_predict_state(PredictorState *ps) { |