From d59a30c2b1ee5a3811cab3a68e390885246bbdc4 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 22 Apr 2026 12:05:10 +0200 Subject: [PATCH 1/3] remove unused tables, 1st part --- lib_com/ivas_rom_com_fx.c | 3 ++- lib_com/options.h | 1 + lib_com/rom_com.h | 4 ++++ lib_com/rom_com_fx.c | 5 ++++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib_com/ivas_rom_com_fx.c b/lib_com/ivas_rom_com_fx.c index 3aa42c5a6..4d277ccee 100644 --- a/lib_com/ivas_rom_com_fx.c +++ b/lib_com/ivas_rom_com_fx.c @@ -82,6 +82,7 @@ const Word16 dft_band_res_cod[3][4] = {0,5,6,7} }; +#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 // Q31 const Word32 dft_res_gains_q_Q31[][2] = { @@ -247,7 +248,7 @@ const Word32 dft_res_gains_q_Q31[][2] = {2144077696, 13136157 }, {2147440640, 13580687 } }; - +#endif /* tables for adaptive Golomb-Rice coding of DFT stereo parameters */ const Word16 dft_code_itd[] = diff --git a/lib_com/options.h b/lib_com/options.h index 33519e38f..d75708a2b 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -102,6 +102,7 @@ #define HARMONIZE_2537_SetTCXModeInfo /* FhG: Harmonize SetTCXModeInfo - IVAS_VERSION OBVIOUSLY NOT FITTING FOR EVS - pipes not green */ #define HARMONIZE_2537_GetTCXMaxenergyChange /* FhG: Harmonize GetTCXMaxenergyChange */ #define HARMONIZE_2508_InitTransientDetection /* FhG: harmonize GetAttackForTCXDecision derivates for evs/ivas */ +#define FIX_BASOP_2095_REMOVE_TABLES_PT01 /* FhG: BASOP issue 2095: remove unused tables, part 01 */ /* #################### End BE switches ################################## */ diff --git a/lib_com/rom_com.h b/lib_com/rom_com.h index 5b1176adf..216b6fb54 100644 --- a/lib_com/rom_com.h +++ b/lib_com/rom_com.h @@ -1152,7 +1152,9 @@ extern const Word32 rot_vec_syn_re_L60_fx[30]; // Q31 extern const Word32 rot_vec_syn_im_L60_fx[30]; // Q31 extern const Word16 bpf_weights_16_Fx[16]; // Q15 +#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 extern const Word16 bpf_weights_16_ivas_fx[16]; // Q15 +#endif extern const Word32 bpf_weights_16_ivas_fx_32[16]; // Q30 extern const Word16 CNG_details_codebook_fx[64][NUM_ENV_CNG]; // Q6 @@ -1625,6 +1627,8 @@ extern const Word32 rot_vec_ana_re_L60_fx[30]; // Q29 extern const Word32 rot_vec_ana_im_L60_fx[30]; // Q29 extern const Word16 LP_assym_window_fx[]; /* Assymetric window for LP analysis @12.8kHz (Q15) */ +#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 extern const Word16 LP_assym_window_16k_fx[]; /* Assymetric window for LP analysis @16kHz (Q15) */ +#endif #endif diff --git a/lib_com/rom_com_fx.c b/lib_com/rom_com_fx.c index 525da856a..497196ecc 100644 --- a/lib_com/rom_com_fx.c +++ b/lib_com/rom_com_fx.c @@ -6814,7 +6814,6 @@ const Word32 rot_vec_syn_im_L60_fx[30] = -232316640 ,-235170976 ,-237380736 ,-238939840 ,-239844032 , }; - const Word16 bpf_weights_16_Fx[16] = { 16385/*0.500020f Q15*/, 23022/*0.702561f Q15*/, 6843/*0.208838f Q15*/, 51/*0.001553f Q15*/, @@ -6823,6 +6822,7 @@ const Word16 bpf_weights_16_Fx[16] = 3/*0.000081f Q15*/, 2/*0.000052f Q15*/, 1/*0.000017f Q15*/, 1/*0.000016f Q15*/ }; +#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 const Word16 bpf_weights_16_ivas_fx[16] = { 32767/*0.999969f Q15*/, 23022/*0.702561f Q15*/, 6843/*0.208838f Q15*/, 51/*0.001553f Q15*/, @@ -6830,6 +6830,7 @@ const Word16 bpf_weights_16_ivas_fx[16] = 9/*0.000270f Q15*/, 3/*0.000080f Q15*/, 1/*0.000030f Q15*/, 3/*0.000082f Q15*/, 3/*0.000081f Q15*/, 2/*0.000052f Q15*/, 1/*0.000017f Q15*/, 1/*0.000016f Q15*/ }; +#endif const Word32 bpf_weights_16_ivas_fx_32[16] = { 1073784774/*1.000040f Q30*/, 754369130/*0.702561f Q30*/, 224238095/*0.208838f Q30*/, 1667521/*0.001553f Q30*/, @@ -36854,6 +36855,7 @@ const Word16 LP_assym_window_fx[L_LP] = { 0x0b0f, 0x0ad8, 0x0aa8, 0x0a82, 0x0a64, 0x0a4e, 0x0a41, 0x0a3d }; +#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 /* LP analysis window (length of the window is 25ms which is 400 samples at 16kHz (Q15) */ const Word16 LP_assym_window_16k_fx[L_LP_16k] = { 0x0a3d, @@ -37257,6 +37259,7 @@ const Word16 LP_assym_window_16k_fx[L_LP_16k] = { 0x0a40, 0x0a3d, }; +#endif /* 4-bit/3-bit TD SWB BWE differential LSF scalar quantizer tables */ /*Q15*/ -- GitLab From 7bbcc4e6b64e2c3f29f5bb9b8819c7b8be36bc7c Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 22 Apr 2026 12:13:42 +0200 Subject: [PATCH 2/3] remove unused tables, 1st part, including pow_10_q11[128] --- lib_com/ivas_rom_com.h | 2 ++ lib_com/ivas_rom_com_fx.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib_com/ivas_rom_com.h b/lib_com/ivas_rom_com.h index 1ac8737ac..038dc6341 100644 --- a/lib_com/ivas_rom_com.h +++ b/lib_com/ivas_rom_com.h @@ -338,7 +338,9 @@ extern const Word32 ls_azimuth_CICP16_fx[9]; extern const Word32 ls_elevation_CICP16_fx[9]; extern const Word32 ls_azimuth_CICP19_fx[11]; extern const Word32 ls_elevation_CICP19_fx[11]; +#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 extern const Word16 pow_10_q11[128]; +#endif extern const Word32 pow_10_q23[14]; extern const Word16 ivas_sin_az_fx[361]; extern const Word16 ivas_sine_panning_tbl_fx[601]; diff --git a/lib_com/ivas_rom_com_fx.c b/lib_com/ivas_rom_com_fx.c index 4d277ccee..e28706f1c 100644 --- a/lib_com/ivas_rom_com_fx.c +++ b/lib_com/ivas_rom_com_fx.c @@ -3420,6 +3420,7 @@ const Word32 ls_azimuth_CICP19_fx[11] = { 125829120, -125829120, 0, 566231040, - /* Q22 */ const Word32 ls_elevation_CICP19_fx[11] = { 0, 0, 0, 0, 0, 0, 0, 146800640, 146800640, 146800640, 146800640 }; +#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 const Word16 pow_10_q11[128] = { 2048, 2085, 2123, 2161, 2200, 2240, 2281, 2322, 2364, 2407, 2451, 2496, 2541, 2587, 2634, 2682, 2731, 2780, 2831, 2882, 2934, 2988, 3042, 3097, 3153, 3211, 3269, 3328, 3389, 3450, 3513, 3576, 3641, 3708, 3775, 3843, 3913, 3984, 4056, 4130, 4205, 4281, 4359, 4438, 4519, 4601, 4684, 4769, 4856, 4944, 5034, 5125, 5218, 5313, @@ -3427,7 +3428,7 @@ const Word16 pow_10_q11[128] = { 8793, 8952, 9115, 9280, 9449, 9620, 9795, 9973, 10154, 10338, 10526, 10717, 10911, 11109, 11311, 11516, 11725, 11938, 12155, 12375, 12600, 12829, 13062, 13299, 13540, 13786, 14036, 14291, 14550, 14815, 15084, 15357, 15636, 15920, 16209, 16503, 16803, 17108, 17418, 17734, 18056, 18384, 18718, 19058, 19404, 19756, 20114 }; - +#endif // Q12 const Word16 icbwe_gsMapping_tbl_fx[16] = { -8192, -5527, -3935, -2907, -2289, -1824, -1404, -1035, -692, -404, -286, -204, -81, 0, 163, 327 -- GitLab From 7e7a83ddcb1452ae44d80a53b19dcfb9c45793c8 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 22 Apr 2026 12:54:35 +0200 Subject: [PATCH 3/3] formatting --- lib_com/rom_com.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib_com/rom_com.h b/lib_com/rom_com.h index 216b6fb54..15d568eda 100644 --- a/lib_com/rom_com.h +++ b/lib_com/rom_com.h @@ -1151,9 +1151,9 @@ extern const Word32 rot_vec_syn_im_L40_fx[20]; // Q31 extern const Word32 rot_vec_syn_re_L60_fx[30]; // Q31 extern const Word32 rot_vec_syn_im_L60_fx[30]; // Q31 -extern const Word16 bpf_weights_16_Fx[16]; // Q15 +extern const Word16 bpf_weights_16_Fx[16]; // Q15 #ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 -extern const Word16 bpf_weights_16_ivas_fx[16]; // Q15 +extern const Word16 bpf_weights_16_ivas_fx[16]; // Q15 #endif extern const Word32 bpf_weights_16_ivas_fx_32[16]; // Q30 @@ -1626,7 +1626,7 @@ extern const Word32 rot_vec_ana_im_L40_fx[20]; // Q29 extern const Word32 rot_vec_ana_re_L60_fx[30]; // Q29 extern const Word32 rot_vec_ana_im_L60_fx[30]; // Q29 -extern const Word16 LP_assym_window_fx[]; /* Assymetric window for LP analysis @12.8kHz (Q15) */ +extern const Word16 LP_assym_window_fx[]; /* Assymetric window for LP analysis @12.8kHz (Q15) */ #ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01 extern const Word16 LP_assym_window_16k_fx[]; /* Assymetric window for LP analysis @16kHz (Q15) */ #endif -- GitLab