From dee49a29201fd56ab4a33779028d1affb9ae30b2 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Thu, 23 Apr 2026 14:05:08 +0200 Subject: [PATCH 1/4] remove unused tables Co-authored-by: Copilot --- lib_com/options.h | 5 +++-- lib_dec/ivas_rom_dec.h | 2 ++ lib_dec/ivas_rom_dec_fx.c | 3 ++- lib_isar/isar_rom_lcld_tables.c | 14 ++++++++++++++ lib_isar/isar_rom_lcld_tables.h | 19 ++++++++++--------- 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index be45e9246..5fbc3ec51 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -99,9 +99,10 @@ #define FIX_BASOP_2532_cx_e /* FhG: Fix issue 2532 about additional exponent variable*/ #define HARMONIZE_2543_SQ_gain /* FhG: Harmonize SQ_gain */ #define FIX_ISSUE_2533_EXTRA_CONDITION /* FhG: Fix issue basop 2533 removing the extra condition*/ -#define HARMONIZE_2537_SetTCXModeInfo /* FhG: Harmonize SetTCXModeInfo - IVAS_VERSION OBVIOUSLY NOT FITTING FOR EVS - pipes not green */ +#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 HARMONIZE_2508_InitTransientDetection /* FhG: harmonize GetAttackForTCXDecision derivates for evs/ivas */ +#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES /* Dolby: remove unused ISAR */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/ivas_rom_dec.h b/lib_dec/ivas_rom_dec.h index aafe3bce9..f79e95cef 100644 --- a/lib_dec/ivas_rom_dec.h +++ b/lib_dec/ivas_rom_dec.h @@ -96,6 +96,8 @@ extern const Word16 dirac_dithering_ele_scale_fx[DIRAC_DIFFUSE_LEVELS]; extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df0; extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df; +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_dt; +#endif #endif /* IVAS_ROM_DEC_H */ diff --git a/lib_dec/ivas_rom_dec_fx.c b/lib_dec/ivas_rom_dec_fx.c index f86a8ee88..2c0b5a50b 100644 --- a/lib_dec/ivas_rom_dec_fx.c +++ b/lib_dec/ivas_rom_dec_fx.c @@ -576,11 +576,12 @@ const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df = huff_nodes_beta_1D_DF }; +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_dt = { huff_nodes_alpha_1D_DT, huff_nodes_beta_1D_DT }; - +#endif /* clang-format on */ diff --git a/lib_isar/isar_rom_lcld_tables.c b/lib_isar/isar_rom_lcld_tables.c index d3b596b40..8337a0fb2 100644 --- a/lib_isar/isar_rom_lcld_tables.c +++ b/lib_isar/isar_rom_lcld_tables.c @@ -294,6 +294,7 @@ const Word32 c_aiQuantMaxValues_fx[ALLOC_TABLE_SIZE] = { 377487360, }; +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE] = { 0, 3, @@ -328,6 +329,7 @@ const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE] = { 152, 180, }; +#endif const Word32 c_aiHuffmanDim_fx[ALLOC_TABLE_SIZE] = { 2, @@ -468,6 +470,8 @@ const Word32 c_aiHuffmanMod[ALLOC_TABLE_SIZE] = { 1, 1, }; + +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE] = { 1, 16, @@ -502,6 +506,7 @@ const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE] = { 153, 181, }; +#endif const UWord32 c_aaiRMSEnvHuffEnc[64][2] = { { 0x0014, 0x0000 }, @@ -19208,6 +19213,7 @@ const Word16 c_aiLogAddTable_fx[LOG_ADD_TABLE_LENGTH] = { 0x00, }; +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH] = { 0x40, 0x40, @@ -19722,6 +19728,7 @@ const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH] = { 0x00, 0x00, }; +#endif const Word16 c_aiBandwidthAdjust48_fx[MAX_BANDS_48] = { 0, @@ -19749,6 +19756,7 @@ const Word16 c_aiBandwidthAdjust48_fx[MAX_BANDS_48] = { 213, }; +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48] = { 0, @@ -19775,6 +19783,7 @@ const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48] = { 180, 213, }; +#endif const Word16 c_aiAbsoluteThresh48_fx[MAX_BANDS_48] = { -1787, @@ -19802,6 +19811,7 @@ const Word16 c_aiAbsoluteThresh48_fx[MAX_BANDS_48] = { -401, }; +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48] = { -1787, -1787, @@ -19827,6 +19837,7 @@ const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48] = { -409, -401, }; +#endif #if PERCEPTUAL_MODEL_SLGAIN_SHIFT == 4 const Word32 c_aiDefaultTheta48[MAX_BANDS_48] = { @@ -20440,6 +20451,7 @@ const Word16 c_aaiSpreadFunction48_fx[MAX_BANDS_48 * MAX_BANDS_48] = { -114, }; +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48] = { 0, -1561, @@ -20972,6 +20984,8 @@ const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48] = { -114, }; +#endif + const Word32 c_pfMagLUT[8] = /* Q31 */ { 0, 394599072, 775760576, 1130504448, 1446750336, 1713728896, 1922348544, 2065504896 }; diff --git a/lib_isar/isar_rom_lcld_tables.h b/lib_isar/isar_rom_lcld_tables.h index 0b8a46bb6..0aa905afc 100644 --- a/lib_isar/isar_rom_lcld_tables.h +++ b/lib_isar/isar_rom_lcld_tables.h @@ -112,14 +112,12 @@ extern const Word32 c_aiDefaultTheta48[MAX_BANDS_48]; extern const Word32 c_afInvScaleFactor_fx[ALLOC_TABLE_SIZE]; extern const Word16 c_afRMSEnvReconstructTable_exp[ENV_RECONSTRUCT_TABLE_SIZE]; -extern const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE]; extern const Word32 c_aiHuffmanDim[ALLOC_TABLE_SIZE]; extern const Word32 c_aiHuffmanMod[ALLOC_TABLE_SIZE]; extern const Word32 c_aiHuffmanDim_fx[ALLOC_TABLE_SIZE]; extern const Word32 c_aiHuffmanMod_fx[ALLOC_TABLE_SIZE]; extern const Word32 c_afScaleFactor_fx[ALLOC_TABLE_SIZE]; extern const Word32 c_aiQuantMaxValues_fx[ALLOC_TABLE_SIZE]; -extern const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE]; #define LOG_ADD_TABLE_LENGTH ( 512 ) @@ -127,17 +125,19 @@ extern const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE]; extern const Word32 c_aiBandwidths48[MAX_BANDS_48]; extern const Word16 c_aiLogAddTable_fx[LOG_ADD_TABLE_LENGTH]; extern const Word16 c_aiBandwidthAdjust48_fx[MAX_BANDS_48]; -extern const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH]; -extern const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48]; - - extern const Word16 c_aiAbsoluteThresh48_fx[MAX_BANDS_48]; extern const Word16 c_aiDefaultTheta48_fx[MAX_BANDS_48]; extern const Word16 c_aaiSpreadFunction48_fx[MAX_BANDS_48 * MAX_BANDS_48]; -extern const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48]; extern const Word32 c_aiDefaultTheta48[MAX_BANDS_48]; -extern const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48]; +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES +extern const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE]; +extern const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH]; +extern const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE]; +extern const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48]; +extern const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48]; +extern const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48]; +#endif #define PRED_QUNAT_FILTER_MAG_BITS ( 3 ) #define PRED_QUANT_FILTER_PHASE_BITS ( 5 ) @@ -238,7 +238,8 @@ extern const UWord32 c_aaiRMSEnvHuffDec[13][HUFF_DEC_TABLE_SIZE]; extern const Word32 c_pfMagLUT[8]; /* Q31 */ extern const Word32 c_pfP2RRealLUT[32]; /* Q31 */ extern const Word32 c_pfP2RImagLUT[32]; /* Q31 */ +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES extern const Word32 c_pfWindowLUT[LCLD_PRED_WIN_LEN]; /* Q31 */ - +#endif #endif /* ISAR_ROM_LCLD_TABLES_H_ */ -- GitLab From 5858c6424603038d46cca2a865054baabcd89fb5 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Thu, 23 Apr 2026 14:43:34 +0200 Subject: [PATCH 2/4] obsolete table --- lib_isar/isar_rom_lcld_tables.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib_isar/isar_rom_lcld_tables.c b/lib_isar/isar_rom_lcld_tables.c index 8337a0fb2..287d3f70c 100644 --- a/lib_isar/isar_rom_lcld_tables.c +++ b/lib_isar/isar_rom_lcld_tables.c @@ -21008,6 +21008,8 @@ const Word32 c_pfP2RImagLUT[32] = /* Q31 */ { 821806080, 418953248 }; +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES const Word32 c_pfWindowLUT[LCLD_PRED_WIN_LEN] = /* Q31 */ { 190779840, 338280192, 610825408, 966922816, 1352359680, 1708457216, 1981002240, 2128502656, 2128502528, 1981002240, 1708456960, 1352359808, 966922624, 610825152, 338280192, 190779776 }; +#endif -- GitLab From ac406941abb86b835bc12740ad3a7cec564643d1 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Thu, 23 Apr 2026 14:54:59 +0200 Subject: [PATCH 3/4] clang format --- lib_isar/isar_rom_lcld_tables.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib_isar/isar_rom_lcld_tables.h b/lib_isar/isar_rom_lcld_tables.h index 0aa905afc..278ca2d74 100644 --- a/lib_isar/isar_rom_lcld_tables.h +++ b/lib_isar/isar_rom_lcld_tables.h @@ -235,9 +235,9 @@ extern const Word32 ( *c_apaiDemodTables[ALLOC_TABLE_SIZE] )[2]; extern const UWord32 c_aaiRMSEnvHuffEnc[64][2]; extern const UWord32 c_aaiRMSEnvHuffDec[13][HUFF_DEC_TABLE_SIZE]; -extern const Word32 c_pfMagLUT[8]; /* Q31 */ -extern const Word32 c_pfP2RRealLUT[32]; /* Q31 */ -extern const Word32 c_pfP2RImagLUT[32]; /* Q31 */ +extern const Word32 c_pfMagLUT[8]; /* Q31 */ +extern const Word32 c_pfP2RRealLUT[32]; /* Q31 */ +extern const Word32 c_pfP2RImagLUT[32]; /* Q31 */ #ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES extern const Word32 c_pfWindowLUT[LCLD_PRED_WIN_LEN]; /* Q31 */ #endif -- GitLab From 26e2c28d288cb7e133997b72a92c24e5aa8559f5 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Fri, 24 Apr 2026 08:19:23 +0200 Subject: [PATCH 4/4] remove more unused Huffmann tables Co-authored-by: Copilot --- lib_dec/ivas_rom_dec_fx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib_dec/ivas_rom_dec_fx.c b/lib_dec/ivas_rom_dec_fx.c index 2c0b5a50b..0f1b4108a 100644 --- a/lib_dec/ivas_rom_dec_fx.c +++ b/lib_dec/ivas_rom_dec_fx.c @@ -476,6 +476,7 @@ static const Word16 huff_nodes_alpha_1D_DF[64][2] = { -2, -62 } }; +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES /* Alpha Fine Huffman table dt */ static const Word16 huff_nodes_alpha_1D_DT[64][2] = { @@ -544,6 +545,7 @@ static const Word16 huff_nodes_alpha_1D_DT[64][2] = { -3, -64 }, { -2, -63 } }; +#endif /* Beta Fine Huffman table df0 */ static const Word16 huff_nodes_first_band_beta[8][2] = @@ -557,12 +559,13 @@ static const Word16 huff_nodes_beta_1D_DF[16][2] = { -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { 9, 8 }, { -5, -13 }, { 11, 10 }, { -4, -14 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 } }; +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES /* Beta Fine Huffman table dt */ static const Word16 huff_nodes_beta_1D_DT[16][2] = { { -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { -13, 8 }, { -5, 9 }, { -14, 10 }, { -4, 11 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 } }; - +#endif const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df0 = { -- GitLab