From 2f9a4b94f3b0db1b96870d12f39eb725da503eee Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Tue, 14 Oct 2025 09:00:35 +0200 Subject: [PATCH 1/2] Add temporary for for Issue 2088 in TEMP_FIX_2088_MSAN_INIT_ERROR --- lib_com/options.h | 2 ++ lib_rend/lib_rend_fx.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 45db98c6d..952893829 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -113,6 +113,8 @@ #define FIX_2021_BANDWIDTH_EXTENSION_PROBLEM /* FhG: increase cldfb buffer precision*/ #define FIX_2085_FLOATING_POINT_LEFTOVERS /* FhG: convert floating-point leftovers in ivas_dirac_config_fx() */ + +#define TEMP_FIX_2088_MSAN_INIT_ERROR /* Eri: Temporary fix for Issue 2088 - MSAN error. Will come with later port of JBM+Split rendering update */ /* #################### Start BASOP porting switches ############################ */ #define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c index dc53538bb..05540a3b1 100644 --- a/lib_rend/lib_rend_fx.c +++ b/lib_rend/lib_rend_fx.c @@ -3524,6 +3524,12 @@ ivas_error IVAS_REND_Open( isar_init_split_rend_handles( hIvasRend->splitRendWrapper ); } +#ifdef TEMP_FIX_2088_MSAN_INIT_ERROR + hIvasRend->splitRendEncBuffer.data = NULL; + hIvasRend->splitRendEncBuffer.config.is_cldfb = 0; + hIvasRend->splitRendEncBuffer.config.numChannels = 0; + hIvasRend->splitRendEncBuffer.config.numSamplesPerChannel = 0; +#endif FOR( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i ) { -- GitLab From 2dcd347a397f2c1f08b60c567f67058e0fcdfb12 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Tue, 14 Oct 2025 09:08:56 +0200 Subject: [PATCH 2/2] Reduce TEMP_FIX_2088_MSAN_INIT_ERROR to include only the single line that is necessary --- lib_rend/lib_rend_fx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c index 05540a3b1..1da56f275 100644 --- a/lib_rend/lib_rend_fx.c +++ b/lib_rend/lib_rend_fx.c @@ -3525,10 +3525,7 @@ ivas_error IVAS_REND_Open( isar_init_split_rend_handles( hIvasRend->splitRendWrapper ); } #ifdef TEMP_FIX_2088_MSAN_INIT_ERROR - hIvasRend->splitRendEncBuffer.data = NULL; - hIvasRend->splitRendEncBuffer.config.is_cldfb = 0; - hIvasRend->splitRendEncBuffer.config.numChannels = 0; - hIvasRend->splitRendEncBuffer.config.numSamplesPerChannel = 0; + hIvasRend->splitRendEncBuffer.data_fx = NULL; #endif FOR( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i ) -- GitLab