All tables now initialized by aac/aacdec_fixed|float
Unified · Split
| @@ -47,6 +47,8 @@ DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME(aac_kbd_short_120))[120]; · 46 unmodified lines | ||
| 47 | 47 | |
| 48 | 48 | static void init_tables_fixed_fn(void) |
| 49 | 49 | { |
| 50 | + AAC_RENAME(ff_cbrt_tableinit)(); | |
| 51 | + | |
| 50 | 52 | AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_long_1024), 4.0, 1024); |
| 51 | 53 | AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_short_128), 6.0, 128); |
| 52 | 54 | |
| @@ -47,6 +47,8 @@ DECLARE_ALIGNED(32, static float, aac_kbd_short_120)[120]; · 46 unmodified lines | ||
| 47 | 47 | |
| 48 | 48 | static void init_tables_float_fn(void) |
| 49 | 49 | { |
| 50 | + AAC_RENAME(ff_cbrt_tableinit)(); | |
| 51 | + | |
| 50 | 52 | AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_long_1024), 4.0, 1024); |
| 51 | 53 | AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_short_128), 6.0, 128); |
| 52 | 54 | |
| @@ -63,11 +63,6 @@ · 62 unmodified lines | ||
| 63 | 63 | # include "mips/aacdec_mips.h" |
| 64 | 64 | #endif |
| 65 | 65 | |
| 66 | −DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME(sine_120))[120]; | |
| 67 | −DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME(sine_960))[960]; | |
| 68 | −DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME(aac_kbd_long_960))[960]; | |
| 69 | −DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME(aac_kbd_short_120))[120]; | |
| 70 | − | |
| 71 | 66 | static av_always_inline void reset_predict_state(PredictorState *ps) |
| 72 | 67 | { |
| 73 | 68 | ps->r0 = 0.0f; |
| @@ -64,8 +64,6 @@ · 63 unmodified lines | ||
| 64 | 64 | #include "avcodec.h" |
| 65 | 65 | #include "codec_internal.h" |
| 66 | 66 | #include "get_bits.h" |
| 67 | −#include "kbdwin.h" | |
| 68 | −#include "sinewin_fixed_tablegen.h" | |
| 69 | 67 | |
| 70 | 68 | #include "aac.h" |
| 71 | 69 | #include "aacdec.h" |
| @@ -1110,22 +1110,10 @@ static av_cold void aac_static_table_init(void) · 1109 unmodified lines | ||
| 1110 | 1110 | |
| 1111 | 1111 | ff_aacdec_common_init_once(); |
| 1112 | 1112 | |
| 1113 | − // window initialization | |
| 1114 | − AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_long_960), 4.0, 960); | |
| 1115 | − AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_short_120), 6.0, 120); | |
| 1116 | − | |
| 1117 | 1113 | #if !USE_FIXED |
| 1118 | − AAC_RENAME(ff_sine_window_init)(AAC_RENAME(sine_960), 960); | |
| 1119 | − AAC_RENAME(ff_sine_window_init)(AAC_RENAME(sine_120), 120); | |
| 1120 | − AAC_RENAME(ff_init_ff_sine_windows)(9); | |
| 1121 | 1114 | ff_aac_float_common_init(); |
| 1122 | 1115 | #else |
| 1123 | − AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_long_1024), 4.0, 1024); | |
| 1124 | − AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_short_128), 6.0, 128); | |
| 1125 | − init_sine_windows_fixed(); | |
| 1126 | 1116 | #endif |
| 1127 | − | |
| 1128 | − AAC_RENAME(ff_cbrt_tableinit)(); | |
| 1129 | 1117 | } |
| 1130 | 1118 | |
| 1131 | 1119 | static AVOnce aac_table_init = AV_ONCE_INIT; |