Commit 8c48d0f1 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2352_COPY_AQ_IN_TCX

parent d429b6b4

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_2352_COPY_AQ_IN_TCX                         /* FhG: basop issue 2352: prevent copying uninitialized values from Aq_fx[][] to Aq_fx_32[][] in TCX */

#define FIX_2353_PTR_INIT                               /* FhG: basop issue 2353: initialize prm_sqQ-pointer, to prevent being uninitialized in case of bfi == 1 */

#define FIX_2356_GET_CHAN_ENERGIES                      /* FhG: basop issue 2356: correctly initialize exponents in getChannelEnergies_fx() */

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

lib_dec/ivas_stereo_mdct_core_dec_fx.c

+0 −16
Original line number Diff line number Diff line
@@ -385,31 +385,15 @@ void stereo_mdct_core_dec_fx( 
#ifdef FIX_2397_COPY_AQ_MDCT_CORE_BFI

    IF( !bfi )

    {

#ifdef FIX_2352_COPY_AQ_IN_TCX

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

#else

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

#endif

        {

#ifdef FIX_2352_COPY_AQ_IN_TCX

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

#else

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

#endif

        }

    }

#else

#ifdef FIX_2352_COPY_AQ_IN_TCX

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

#else

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

#endif

    {

#ifdef FIX_2352_COPY_AQ_IN_TCX

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

#else

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

#endif

    }

#endif