diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-05-06 12:18:02 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-05-06 23:59:27 +0200 |
| commit | 41922bef7a4f898ba61bcf082379b4b19922827b (patch) | |
| tree | 6384e2ba25b385fe1e0f7e6c6c62824311d60b26 | |
| parent | c13b5d96c8ad4be1e5d954649b635f192c8c76d7 (diff) | |
| download | ffmpeg-41922bef7a4f898ba61bcf082379b4b19922827b.tar.gz | |
avcodec/aac/aacdec_(fixed|float): Avoid AAC_RENAME, INTFLOAT
Unnecessary now that this has been detemplatized.
Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/aac/aacdec_fixed.c | 20 | ||||
| -rw-r--r-- | libavcodec/aac/aacdec_float.c | 18 |
2 files changed, 19 insertions, 19 deletions
diff --git a/libavcodec/aac/aacdec_fixed.c b/libavcodec/aac/aacdec_fixed.c index 92204180a1..083f3b073e 100644 --- a/libavcodec/aac/aacdec_fixed.c +++ b/libavcodec/aac/aacdec_fixed.c @@ -43,22 +43,22 @@ #include "libavcodec/cbrt_data.h" #include "libavcodec/aacsbr.h" -DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME2(aac_kbd_long_1024))[1024]; -DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME2(aac_kbd_short_128))[128]; -DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME(aac_kbd_long_960))[960]; -DECLARE_ALIGNED(32, static INTFLOAT, AAC_RENAME(aac_kbd_short_120))[120]; +DECLARE_ALIGNED(32, static int, aac_kbd_long_1024_fixed)[1024]; +DECLARE_ALIGNED(32, static int, aac_kbd_short_128_fixed)[128]; +DECLARE_ALIGNED(32, static int, aac_kbd_long_960_fixed)[960]; +DECLARE_ALIGNED(32, static int, aac_kbd_short_120_fixed)[120]; static void init_tables_fixed_fn(void) { - AAC_RENAME(ff_cbrt_tableinit)(); + ff_cbrt_tableinit_fixed(); - AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_long_1024), 4.0, 1024); - AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_short_128), 6.0, 128); + ff_kbd_window_init_fixed(aac_kbd_long_1024_fixed, 4.0, 1024); + ff_kbd_window_init_fixed(aac_kbd_short_128_fixed, 6.0, 128); - AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_long_960), 4.0, 960); - AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_short_120), 6.0, 120); + ff_kbd_window_init_fixed(aac_kbd_long_960_fixed, 4.0, 960); + ff_kbd_window_init_fixed(aac_kbd_short_120_fixed, 6.0, 120); - AAC_RENAME(ff_aac_sbr_init)(); + ff_aac_sbr_init_fixed(); init_sine_windows_fixed(); } diff --git a/libavcodec/aac/aacdec_float.c b/libavcodec/aac/aacdec_float.c index 511db1a604..5efc0c1e54 100644 --- a/libavcodec/aac/aacdec_float.c +++ b/libavcodec/aac/aacdec_float.c @@ -51,19 +51,19 @@ DECLARE_ALIGNED(32, static float, aac_kbd_short_120)[120]; static void init_tables_float_fn(void) { - AAC_RENAME(ff_cbrt_tableinit)(); + ff_cbrt_tableinit(); - AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_long_1024), 4.0, 1024); - AAC_RENAME(ff_kbd_window_init)(AAC_RENAME2(aac_kbd_short_128), 6.0, 128); + ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024); + ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128); - AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_long_960), 4.0, 960); - AAC_RENAME(ff_kbd_window_init)(AAC_RENAME(aac_kbd_short_120), 6.0, 120); + ff_kbd_window_init(aac_kbd_long_960, 4.0, 960); + ff_kbd_window_init(aac_kbd_short_120, 6.0, 120); - AAC_RENAME(ff_sine_window_init)(AAC_RENAME(sine_960), 960); - AAC_RENAME(ff_sine_window_init)(AAC_RENAME(sine_120), 120); - AAC_RENAME(ff_init_ff_sine_windows)(9); + ff_sine_window_init(sine_960, 960); + ff_sine_window_init(sine_120, 120); + ff_init_ff_sine_windows(9); - AAC_RENAME(ff_aac_sbr_init)(); + ff_aac_sbr_init(); ff_aac_float_common_init(); } |