Commit 0ffa6c6d authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2382_COPY_AQ_IN_MCT

parent e70a649a

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_2382_COPY_AQ_IN_MCT                         /* FhG: basop issue 2382: 2nd instance of prevent copying uninitialized values from Aq_fx[][] to Aq_fx_32[][] in TCX */

#define FIX_2391_INIT_HQ_GENERIC_OFFSET                 /* FhG/Eri: basop issue 2391: make sure hq_generic_offset is initialized inside hq_hr_dec_fx() */

#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 */

lib_dec/ivas_mct_dec_fx.c

+0 −13
Original line number Diff line number Diff line
@@ -214,20 +214,14 @@ ivas_error ivas_mct_dec_fx( 
        }

    }



#ifndef FIX_2382_COPY_AQ_IN_MCT

    Word32 Aq_fx_32[6][2][102];

#endif

    /* MCT reconstruction and CoreCoder updates */

    FOR( cpe_id = 0; cpe_id < nCPE; cpe_id++ )

    {

#ifdef FIX_2382_COPY_AQ_IN_MCT

        Word32 Aq_fx_32[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )];

#endif

        hCPE = st_ivas->hCPE[cpe_id];



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

        {

#ifdef FIX_2382_COPY_AQ_IN_MCT

#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 ) )
@@ -247,20 +241,13 @@ ivas_error ivas_mct_dec_fx( 


                Copy_Scale_sig_16_32_DEPREC( Aq_fx[cpe_id][n], Aq_fx_32[n], i_mult( nSubframes, M ), Q16 - Q12 ); // Q16

            }

#else

            Copy_Scale_sig_16_32_DEPREC( Aq_fx[cpe_id][n], Aq_fx_32[cpe_id][n], 102, Q16 - Q12 ); // Q16

#endif

            x_fx[n][0] = output_fx[n + ( cpe_id * CPE_CHANNELS )];                      // Q11

            x_fx[n][1] = output_fx[n + ( cpe_id * CPE_CHANNELS )] + ( L_FRAME48k / 2 ); // Q11

            move16();

            move16();

        }



#ifdef FIX_2382_COPY_AQ_IN_MCT

        ivas_mdct_core_tns_ns_fx( hCPE, fUseTns[cpe_id], tnsData[cpe_id], x_fx, Aq_fx_32, 1, 20 );

#else

        ivas_mdct_core_tns_ns_fx( hCPE, fUseTns[cpe_id], tnsData[cpe_id], x_fx, Aq_fx_32[cpe_id], 1, 20 );

#endif

    }



    test();

lib_dec/ivas_stereo_mdct_core_dec_fx.c

+0 −5
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ void stereo_mdct_core_dec_fx( 


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

    {

#ifdef FIX_2382_COPY_AQ_IN_MCT

        nSubframes[ch] = 1; /* Q0 */

        move16();
@@ -307,10 +306,6 @@ void stereo_mdct_core_dec_fx( 
            nSubframes[ch] = NB_DIV;

            move16();

        }

#else

        nSubframes[ch] = EQ_16( sts[ch]->core, TCX_10_CORE ) ? NB_DIV : 1; /* Q0 */

        move16();

#endif



        FOR( k = 0; k < nSubframes[ch]; k++ )

        {