From 7b060915d3e1cf411454be9038e48e634b521d9d Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Mon, 11 Aug 2025 22:13:49 +0200 Subject: [PATCH] port flp MR 1724 --- lib_com/ivas_rom_com.c | 3 ++- lib_com/options.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib_com/ivas_rom_com.c b/lib_com/ivas_rom_com.c index 183e61ca1..cdd290ce6 100644 --- a/lib_com/ivas_rom_com.c +++ b/lib_com/ivas_rom_com.c @@ -1737,6 +1737,7 @@ const Word32 ivas_param_mc_dmx_fac_CICP19_3tc_fx[36] = 0,0,2147483647,2147483647,0,0,0,0,0,0,0,0 /*Ct*/ }; +#ifndef FIX_1157_OBSOLETE_DMX_TABLE const Word32 ivas_param_mc_dmx_fac_CICP19_4tc_fx[48] = { 2147483647,0,1518500224,1518500224,2147483647,0,2147483647,0,0,0,0,0, /*Lht*/ @@ -1744,7 +1745,7 @@ const Word32 ivas_param_mc_dmx_fac_CICP19_4tc_fx[48] = 0,0,0,0,0,0,0,0,2147483647,0,2147483647,0, /*Lut*/ 0,0,0,0,0,0,0,0,0,2147483647,0,2147483647 /*Rut*/ }; - +#endif //Q15 const Word16 ivas_param_mc_ild_fac_CICP6_2tc_fx[6] = diff --git a/lib_com/options.h b/lib_com/options.h index 62bccdca6..cca9bc793 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -123,6 +123,7 @@ #define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */ #define NONBE_FIX_1130_DIV_ZERO_LEV_DUR /* VA: issue 1130: avoid div by zero in L-D by thresholding R[0] to a min value of 100.0 */ #define FIX_1111_TDM_LSP_BUFFER /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */ +#define FIX_1157_OBSOLETE_DMX_TABLE /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */ #define NONBE_1325_TD_STEREO_QUANT_LSF_SEC /* Nokia: issue 1325: fix for usage of active_cnt variable in TD stereo LSFQ */ #define NONBE_1329_FIX_OSBA_CRASH /* FhG: issue 1329: prevent assert when bit budget is low*/ #define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER /* FhG: issue 1128: set output ambisonics order to input order for EXT output */ -- GitLab