RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-29 02:42:21 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/aac/aacdec_(fixed|float): Avoid AAC_RENAME, INTFLOAT

Browse Source 
Unnecessary now that this has been detemplatized.

Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-05-06 12:18:02 +02:00
parent c13b5d96c8
commit 41922bef7a
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/aac/aacdec_fixed.c
View File

@ -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();
}

18
libavcodec/aac/aacdec_float.c
View File

@ -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();
}