Commit d63dc2ab authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_135_MDCT_STEREO_MODE_UNINITIALIZED

parent c51973f8

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ 
#define SPAR_SCALING_HARMONIZATION                      /* Issue 80: Changes to harmonize scaling in spar */

#define FIX_I98_HANDLES_TO_NULL                         /* Issue 98: do the setting of all handles to NULL in one place */

#define FIX_I102_SWB_TBE_SWITCH                         /* Issue 102: avoid IO->SWB switching code for IVAS, generate SHB ACB mem with lerp in case of switch */

#define FIX_135_MDCT_STEREO_MODE_UNINITIALIZED          /* Issue 135: fix uninitialized value usage in SBA MDCT-Stereo core with PLC */

#define FIX_CONTROLLABLE_SID_UPDATE_RATE                /* Issue 117: fix controllable SID update rate mechanism */

#define FIX_DIRAC_CHANNELS                              /* Issue 71: lower number of DirAC analysis channels */

#define FIX_CREND_CHANNELS                              /* Issue 71: fix number of Crend channels */

lib_dec/ivas_cpe_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -791,12 +791,10 @@ ivas_error create_cpe_dec( 
        set_s( hCPE->hStereoMdct->prev_ms_mask[0], 0, MAX_SFB );

        set_s( hCPE->hStereoMdct->prev_ms_mask[1], 0, MAX_SFB );

        hCPE->hStereoMdct->lastCoh = 1.f;

#ifdef FIX_135_MDCT_STEREO_MODE_UNINITIALIZED

        hCPE->hStereoMdct->mdct_stereo_mode[0] = SMDCT_DUAL_MONO;

        hCPE->hStereoMdct->mdct_stereo_mode[1] = SMDCT_DUAL_MONO;

        hCPE->hStereoMdct->IGFStereoMode[0] = -1;

        hCPE->hStereoMdct->IGFStereoMode[1] = -1;

#endif

    }



    /*-----------------------------------------------------------------*

lib_dec/ivas_stereo_mdct_core_dec.c

+0 −7
Original line number Diff line number Diff line
@@ -218,13 +218,6 @@ void stereo_mdct_core_dec( 
    initMdctStereoDecData( hCPE->hStereoMdct, sts[0]->igf, sts[0]->hIGFDec->igfData.igfInfo.grid, hCPE->element_brate, sts[0]->bwidth );



    hCPE->hStereoMdct->isSBAStereoMode = ( ( st_ivas->ivas_format == SBA_FORMAT ) && ( st_ivas->nchan_transport == 2 ) );

#ifndef FIX_135_MDCT_STEREO_MODE_UNINITIALIZED

    /*to prevent unitialized values during condition checks for stereo IGF*/

    if ( hCPE->hStereoMdct->isSBAStereoMode )

    {

        set_s( hCPE->hStereoMdct->IGFStereoMode, -1, 2 );

    }

#endif



    if ( !bfi )

    {