History

aacdec: deduplicate table initizalization

All tables now initialized by aac/aacdec_fixed|float

Lynne committed 2 years ago

Commit b7387ea1 parent 41ae2b05 files · +4 −19Browse files

Unified · Split

5 files
  1. libavcodec/aac/aacdec_fixed.c +2 −0
  2. libavcodec/aac/aacdec_float.c +2 −0
  3. libavcodec/aacdec.c +0 −5
  4. libavcodec/aacdec_fixed.c +0 −2
  5. libavcodec/aacdec_template.c +0 −12
libavcodec/aac/aacdec_fixed.c+2−0
@@ -47,6 +47,8 @@ DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME(aac_kbd_short_120))[120]; · 46 unmodified lines
4747
4848 static void init_tables_fixed_fn(void)
4949 {
50+ AAC_RENAME(ff_cbrt_tableinit)();
51+
5052 AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_long_1024), 4.0, 1024);
5153 AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_short_128), 6.0, 128);
5254
libavcodec/aac/aacdec_float.c+2−0
@@ -47,6 +47,8 @@ DECLARE_ALIGNED(32, static float, aac_kbd_short_120)[120]; · 46 unmodified lines
4747
4848 static void init_tables_float_fn(void)
4949 {
50+ AAC_RENAME(ff_cbrt_tableinit)();
51+
5052 AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_long_1024), 4.0, 1024);
5153 AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_short_128), 6.0, 128);
5254
libavcodec/aacdec.c+0−5
@@ -63,11 +63,6 @@ · 62 unmodified lines
6363 # include "mips/aacdec_mips.h"
6464 #endif
6565
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−
7166 static av_always_inline void reset_predict_state(PredictorState *ps)
7267 {
7368 ps->r0 = 0.0f;
libavcodec/aacdec_fixed.c+0−2
@@ -64,8 +64,6 @@ · 63 unmodified lines
6464 #include "avcodec.h"
6565 #include "codec_internal.h"
6666 #include "get_bits.h"
67−#include "kbdwin.h"
68−#include "sinewin_fixed_tablegen.h"
6967
7068 #include "aac.h"
7169 #include "aacdec.h"
libavcodec/aacdec_template.c+0−12
@@ -1110,22 +1110,10 @@ static av_cold void aac_static_table_init(void) · 1109 unmodified lines
11101110
11111111 ff_aacdec_common_init_once();
11121112
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−
11171113 #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);
11211114 ff_aac_float_common_init();
11221115 #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();
11261116 #endif
1127−
1128− AAC_RENAME(ff_cbrt_tableinit)();
11291117 }
11301118
11311119 static AVOnce aac_table_init = AV_ONCE_INIT;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t