Commit 6d597ff1 authored by norvell's avatar norvell
Browse files

Merge branch 'basop-2317-msan-use-of-uninitialized-value-in-masa-dtx-encoding' into 'main' 

[Non-BE] Resolve: MSAN: use-of-uninitialized-value in MASA DTX encoding - float

See merge request !2500
parents e4dd50d4 677b0437

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

lib_enc/ivas_stereo_dft_enc.c

+5 −2
Original line number Diff line number Diff line
@@ -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 )

        {