Commit dd4fad6a authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2355_IGF_EXP_POWERSPEC

parent 0c87adf0

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */

#define FIX_2355_IGF_EXP_POWERSPEC                      /* FhG: basop issue 2355: make sure exp_pPowerSpectrumParameter_fx is initialized in all cases */

#define FIX_2319_CLDFB_INIT_FLAGS                       /* FhG: basop issue 2319: init hs->flags during openCldfb(), to avoid reading of uninitialized memory */

#define FIX_BASOP_2357_OBJECT_EDIT_MSAN                 /* Nokia: basop issue 2357: initialize missing exponents in object edit */

#define FIX_BASOP_2354_MSAN_DIFF_Q_VALUE                /* Nokia: Initialize Q value of diffuseness in rendering to Q30 */

lib_enc/igf_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -4271,10 +4271,8 @@ void IGFEncApplyStereo_fx( 
    {

        pPowerSpectrumParameter_fx[0] = NULL;

        pPowerSpectrumParameter_fx[1] = NULL;

#ifdef FIX_2355_IGF_EXP_POWERSPEC

        exp_pPowerSpectrumParameter_fx[0] = NULL;

        exp_pPowerSpectrumParameter_fx[1] = NULL;

#endif

        pPowerSpectrumParameterMsInv_fx[0] = NULL;

        pPowerSpectrumParameterMsInv_fx[1] = NULL;

        q_pPowerSpectrumParameterMsInv_fx[0] = NULL;
@@ -4297,9 +4295,7 @@ void IGFEncApplyStereo_fx( 
        ELSE

        {

            pPowerSpectrumParameter_fx[ch] = NULL;

#ifdef FIX_2355_IGF_EXP_POWERSPEC

            exp_pPowerSpectrumParameter_fx[ch] = NULL;

#endif

        }



        IGF_Whitening_ivas_fx( hIGFEnc[ch], pPowerSpectrumParameter_fx[ch], exp_pPowerSpectrumParameter_fx[ch], igfGridIdx, sts[ch]->hTranDet->transientDetector.bIsAttackPresent, last_core_acelp, ( sts[0]->hTcxEnc->fUseTns[frameno] || sts[1]->hTcxEnc->fUseTns[frameno] ), sp_aud_decision0, element_brate, sts[ch]->element_mode );