Commit d9d71910 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2370_UNUSED_BUFFERS_CORE_ENC

parent 118b27df

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_2370_UNUSED_BUFFERS_CORE_ENC                /* VA: basop issue 2370: remove temporary input buffers in core-encoder  */

#define FIX_2376_FIX_USAN_PRE_PROC                      /* VA: basop issue 2376: Resolve "USAN: SEGV in ivas_compute_core_buffers_fx() */

#define FIX_2367_REMOVE_CODE_ICBWE                      /* VA: basop issue 2367: Remove IC-BWE obsolete code  */

#define REMOVE_SCALING_SHB_SPEECH                       /* VA: remove unnecessary scaling and 32-bit buffers from ivas_core_enc_fx() */

lib_enc/ivas_core_enc_fx.c

+0 −28
Original line number Diff line number Diff line
@@ -611,9 +611,6 @@ ivas_error ivas_core_enc_fx( 
     * Postprocessing, BWEs and Updates

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



#ifndef FIX_2370_UNUSED_BUFFERS_CORE_ENC

    Word16 tmp_input_fx[L_FRAME48k], tmp_old_input_fx[L_FRAME48k], q_inp[2];

#endif

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

    {

        st = sts[n];
@@ -628,18 +625,6 @@ ivas_error ivas_core_enc_fx( 
            move16();

        }



#ifndef FIX_2370_UNUSED_BUFFERS_CORE_ENC

        Copy( st->input_fx - input_frame, tmp_old_input_fx, input_frame );

        Copy( st->input_fx, tmp_input_fx, input_frame );

        q_inp[0] = st->q_old_inp;

        q_inp[1] = st->q_inp;



        Scale_sig( st->input_fx - input_frame, shl( input_frame, 1 ), sub( -1, st->q_inp ) );

        st->q_inp = -1;

        move16();

        st->q_old_inp = -1;

        move16();

#endif

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

         * Postprocessing for ACELP/HQ core switching

         *---------------------------------------------------------------------*/
@@ -683,7 +668,6 @@ ivas_error ivas_core_enc_fx( 
         * SWB(FB) BWE encoding

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



#ifdef FIX_2370_UNUSED_BUFFERS_CORE_ENC

        Word16 q_inp_orig;

        q_inp_orig = st->q_inp;

        move16();
@@ -696,7 +680,6 @@ ivas_error ivas_core_enc_fx( 
            move16();

            Scale_sig( st->input_fx - input_frame, shl( input_frame, 1 ), sub( st->q_inp, q_inp_orig ) );

        }

#endif



#ifndef REMOVE_SCALING_SHB_SPEECH

        new_swb_speech_fx = new_swb_speech_buffer_fx + STEREO_DFT_OVL_MAX;
@@ -813,7 +796,6 @@ ivas_error ivas_core_enc_fx( 


        Scale_sig( old_syn_12k8_16k_fx[n], L_FRAME16k, sub( Q1, Q_new[n] ) ); // Q0



#ifdef FIX_2370_UNUSED_BUFFERS_CORE_ENC

        IF( GE_32( input_Fs, 32000 ) && st->hBWE_TD != NULL )

        {

            Scale_sig( st->input_fx, input_frame, sub( q_inp_orig, st->q_inp ) );
@@ -821,7 +803,6 @@ ivas_error ivas_core_enc_fx( 
            move16();

        }



#endif

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

         * SWB DTX/CNG encoding

         *---------------------------------------------------------------------*/
@@ -886,15 +867,6 @@ ivas_error ivas_core_enc_fx( 
#endif

        }



#ifndef FIX_2370_UNUSED_BUFFERS_CORE_ENC

        Copy( tmp_old_input_fx, st->input_fx - input_frame, input_frame );

        Copy( tmp_input_fx, st->input_fx, input_frame );

        st->q_old_inp = q_inp[0];

        move16();

        st->q_inp = q_inp[1];

        move16();



#endif

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

         * Common updates

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