From 7914cb6a945f24061c58ef2130f0a215f559d1da Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Fri, 23 Jan 2026 08:43:19 +0100 Subject: [PATCH] Add fix for Stereo CNG uninit value read under FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG --- lib_com/options.h | 2 +- lib_enc/ivas_stereo_dft_enc.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 42a41806b2..30f559de2c 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -171,7 +171,7 @@ /* #################### Start NON-BE switches ############################ */ /* any switch which is non-be wrt. TS 26.258 V3.0 */ #define FIX_1465_SWB_TBE_RANDOM_VECTOR_CREATION /* Dolby: issue 1465: Fix constant in create_random_vector() to allow more reliable fixed point port */ - +#define FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG /* Eri: Basop issue 2317: Uninitialized value read in case of DTX and BW switching */ #define FIX_1500_ISM_MD_DTX /* VA: float issue 1500: fix ISM elevation metadata smoothing in DTX */ diff --git a/lib_enc/ivas_stereo_dft_enc.c b/lib_enc/ivas_stereo_dft_enc.c index a72142af05..85a1952be1 100644 --- a/lib_enc/ivas_stereo_dft_enc.c +++ b/lib_enc/ivas_stereo_dft_enc.c @@ -2980,11 +2980,14 @@ static void stereo_dft_enc_compute_prm( /*------------------------------------------------------------------* * Compute Side gains *-----------------------------------------------------------------*/ - +#ifdef FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG + mvr2r( pSideGain, hStereoDft->sidSideGain, STEREO_DFT_BAND_MAX ); /* Copy all sideGain values since BW change may be reverted during CNG */ +#endif for ( b = 0; b < hStereoDft->nbands; b++ ) { +#ifndef FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG hStereoDft->sidSideGain[b] = *( pSideGain + b ); - +#endif /* Quantization */ if ( flag_quant ) { -- GitLab