From f89c8f3013620a034bc56f7bd0e7914481302c54 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Thu, 23 Apr 2026 14:11:48 +0200 Subject: [PATCH 1/2] remove unsued tables --- lib_com/options.h | 1 + lib_dec/ivas_rom_dec.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 1b2eded86..f24e051b4 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -163,6 +163,7 @@ #define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */ #define FIX_FLOAT_1539_G192_FORMAT_SWITCH /* Nokia: reintroduce format switching for g192 bitstreams */ #define FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN /* FhG: float issue 1560: Avoid optimizing the division on the result of maxWithSign() with -funsafe-math-optimizations */ +#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES /* Dolby: remove unused ISAR */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/ivas_rom_dec.c b/lib_dec/ivas_rom_dec.c index 602918b86..0a639404c 100644 --- a/lib_dec/ivas_rom_dec.c +++ b/lib_dec/ivas_rom_dec.c @@ -600,11 +600,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 */ -- GitLab From bbbd2962fcf04d13307186e4a234a725e461ab9a Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Mon, 27 Apr 2026 13:57:46 +0200 Subject: [PATCH 2/2] unused tables Co-authored-by: Copilot --- lib_dec/ivas_rom_dec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib_dec/ivas_rom_dec.c b/lib_dec/ivas_rom_dec.c index 0a639404c..52123b748 100644 --- a/lib_dec/ivas_rom_dec.c +++ b/lib_dec/ivas_rom_dec.c @@ -500,6 +500,7 @@ static const int16_t huff_nodes_alpha_1D_DF[64][2] = { -2, -62 } }; +#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES /* Alpha Fine Huffman table dt */ static const int16_t huff_nodes_alpha_1D_DT[64][2] = { @@ -568,6 +569,7 @@ static const int16_t huff_nodes_alpha_1D_DT[64][2] = { -3, -64 }, { -2, -63 } }; +#endif /* Beta Fine Huffman table df0 */ static const int16_t huff_nodes_first_band_beta[8][2] = @@ -581,12 +583,13 @@ static const int16_t 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 int16_t 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