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

[cleanup] accept FIX_2367_REMOVE_CODE_ICBWE

parent d9f6afcb

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_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() */

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

lib_dec/ivas_core_dec_fx.c

+0 −7
Original line number Diff line number Diff line
@@ -1179,13 +1179,6 @@ ivas_error ivas_core_dec_fx( 
            q = 11;

            move16();



#ifndef FIX_2367_REMOVE_CODE_ICBWE

            if ( hCPE->hStereoDft != NULL )

            {

                hCPE->hStereoDft->td_gain_fx[0] = 1;

                move32();

            }

#endif

            stereo_icBWE_dec_fx( hCPE, hb_synth_32_fx[0], hb_synth_32_fx[1], tmp_buffer_fx /*fb_synth_ref*/, voice_factors_fx[0], output_frame, &q, Q_white_exc );

            test();

            test();

lib_dec/ivas_stereo_icbwe_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -156,14 +156,12 @@ void stereo_icBWE_dec_fx( 
    STEREO_ICBWE_DEC_HANDLE hStereoICBWE = hCPE->hStereoICBWE;

    st = hCPE->hCoreCoder[0];



#ifdef FIX_2367_REMOVE_CODE_ICBWE

    if ( hCPE->hStereoDft != NULL )

    {

        hCPE->hStereoDft->td_gain_fx[0] = 1;

        move32();

    }



#endif

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

     * skip IC-BWE in case of mono DMX output                             *

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

lib_enc/ivas_core_enc_fx.c

+0 −35
Original line number Diff line number Diff line
@@ -823,48 +823,13 @@ ivas_error ivas_core_enc_fx( 
         *  Inter-channel BWE encoding

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



#ifndef FIX_2367_REMOVE_CODE_ICBWE

        Word16 q_new_swb_speech_buffer = getScaleFactor16( new_swb_speech_buffer_fx_16, L_FRAME48k + STEREO_DFT_OVL_MAX );

        Scale_sig( new_swb_speech_buffer_fx_16, L_FRAME48k + STEREO_DFT_OVL_MAX, q_new_swb_speech_buffer ); // st->q_inp+q_new_swb_speech_buffer

        q_new_swb_speech_buffer = add( st->q_inp, q_new_swb_speech_buffer );

#endif

        test();

        test();

        IF( n == 0 && GE_32( input_Fs, 32000 ) && hStereoICBWE != NULL )

        {

#ifndef FIX_2367_REMOVE_CODE_ICBWE

#ifdef FIX_2367_REMOVE_CODE_ICBWE

            Word16 q_new_swb_speech_buffer = st->q_inp;

#endif

            Word32 voice_factors_fx32[CPE_CHANNELS][NB_SUBFR16k];

            stereo_icBWE_preproc_fx( hCPE, input_frame, new_swb_speech_buffer_fx_16 /*tmp buffer*/, q_new_swb_speech_buffer );



            q_new_swb_speech_buffer = add( q_new_swb_speech_buffer, Q16 );

            Copy_Scale_sig_16_32_no_sat( new_swb_speech_buffer_fx_16, new_swb_speech_buffer_fx, L_FRAME48k + STEREO_DFT_OVL_MAX, Q16 ); // q_new_swb_speech_buffer+st->q_inp - 16 - > q_new_swb_speech_buffer+st->q_inp

            Copy_Scale_sig_16_32_no_sat( voice_factors_fx[0], voice_factors_fx32[0], NB_SUBFR16k, Q16 );                                // Q31



            stereo_icBWE_enc_fx( hCPE, shb_speech_fx32, sub( Q31, Q_shb_spch ), new_swb_speech_buffer_fx, sub( Q31, q_new_swb_speech_buffer ), voice_factors_fx32[0] );

#else

            stereo_icBWE_preproc_fx( hCPE, input_frame, new_swb_speech_buffer_fx_16 /*tmp buffer*/, st->q_inp );



            stereo_icBWE_enc_fx( hCPE, shb_speech_fx, new_swb_speech_buffer_fx_16, st->q_inp, voice_factors_fx[0] );

#endif

#ifndef FIX_2367_REMOVE_CODE_ICBWE

            IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )

            {

                test();

                test();

                test();

                IF( ( EQ_16( st->extl, SWB_TBE ) || EQ_16( st->extl, WB_TBE ) || EQ_16( st->extl, FB_TBE ) ) && EQ_16( st->flag_ACELP16k, 1 ) )

                {

                }

                ELSE

                {

                    hStereoICBWE->prevSpecMapping_fx = 0;

                    move32();

                }

            }

#endif

        }



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