From 045769d5a48cfcf221ab333168af5bc0b764196b Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Fri, 16 Jan 2026 12:04:40 +0200 Subject: [PATCH 1/2] Fix basop issue 2329 by changing check to check for structure. --- lib_com/options.h | 1 + lib_rend/lib_rend_fx.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index ffac0ff4e..b18fb9694 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -101,6 +101,7 @@ #define HARM_CORECODER_UPDT /* VA: basop issue 2342: Remove duplicated code in core-coder common update functions */ #define HARM_CORE_SW /* VA: basop issue 2314: Remove duplicated code in the core switching */ #define HARM_PREPROC /* VA: basop issue 2339: Remove duplicated code in the core-coder DTX */ +#define FIX_BASOP_2329_UNINIT_VALUE /* Nokia: basop issue 2329: Fix issue by checking for structure instead of length */ /* #################### End BE switches ################################## */ diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c index 101015fd0..fd343ee5c 100644 --- a/lib_rend/lib_rend_fx.c +++ b/lib_rend/lib_rend_fx.c @@ -11185,7 +11185,11 @@ static void intermidiate_ext_dirac_render( move16(); } +#ifdef FIX_BASOP_2329_UNINIT_VALUE + IF( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_fx ) +#else IF( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_len > 0 ) +#endif { Word16 shift, norm1, norm2; Word32 tmp1, tmp2; -- GitLab From a00e78e244f91e7065a641ddd09c15a701db3ef7 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Mon, 19 Jan 2026 12:43:03 +0200 Subject: [PATCH 2/2] Init related length variables to zero. --- lib_rend/ivas_dirac_rend_fx.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib_rend/ivas_dirac_rend_fx.c b/lib_rend/ivas_dirac_rend_fx.c index 83ce8af45..e280a989b 100644 --- a/lib_rend/ivas_dirac_rend_fx.c +++ b/lib_rend/ivas_dirac_rend_fx.c @@ -856,6 +856,11 @@ ivas_error ivas_dirac_alloc_mem_fx( /* Prototypes */ hDirAC_mem->proto_direct_buffer_f_fx = NULL; hDirAC_mem->proto_diffuse_buffer_f_fx = NULL; +#ifdef FIX_BASOP_2329_UNINIT_VALUE + hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_len = 0; + hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_len = 0; + hDirAC_mem->proto_diffuse_buffer_f_len = 0; +#endif test(); test(); IF( NE_32( renderer_type, RENDERER_BINAURAL_PARAMETRIC ) && NE_32( renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) && NE_32( renderer_type, RENDERER_STEREO_PARAMETRIC ) ) -- GitLab