Commit ea061b27 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2397_COPY_AQ_MDCT_CORE_BFI

parent cad786c1

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#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_2397_COPY_AQ_MDCT_CORE_BFI                  /* FhG: prevent copying of uninit memory in MDCT stereo core if bfi is set */

#define HARMONIZE_TBE                                   /* VA: harmonize core-coder TBE function duplications */

#define FIX_2405_HARM_SMC_INIT                          /* VA, basop 2405, harmonisation of SMC init */

#define FIX_2280_REDUCTION_UNNECESSARY_SCALING          /* VA: reduction of unnecessary scaling */

lib_dec/ivas_mct_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -222,12 +222,8 @@ ivas_error ivas_mct_dec_fx( 


        FOR( n = 0; n < CPE_CHANNELS; n++ )

        {

#ifdef FIX_2397_COPY_AQ_MDCT_CORE_BFI

            test();

            IF( !st_ivas->bfi && NE_16( hCPE->hCoreCoder[n]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )

#else

            IF( NE_16( hCPE->hCoreCoder[n]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )

#endif

            {

                Word16 nSubframes;

lib_dec/ivas_stereo_mdct_core_dec_fx.c

+0 −7
Original line number Diff line number Diff line
@@ -377,7 +377,6 @@ void stereo_mdct_core_dec_fx( 
        }

    }



#ifdef FIX_2397_COPY_AQ_MDCT_CORE_BFI

    IF( !bfi )

    {

        FOR( ch = 0; ch < nChannels; ch++ )
@@ -385,12 +384,6 @@ void stereo_mdct_core_dec_fx( 
            Copy_Scale_sig_16_32_DEPREC( Aq_fx[ch], Aq_fx_32[ch], i_mult( nSubframes[ch], M ), sub( Q16, Q12 ) ); /* Q16 */

        }

    }

#else

    FOR( ch = 0; ch < nChannels; ch++ )

    {

        Copy_Scale_sig_16_32_DEPREC( Aq_fx[ch], Aq_fx_32[ch], nSubframes[ch] * M, sub( Q16, Q12 ) ); /* Q16 */

    }

#endif



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

     * Stereo processing