Commit c4390ee2 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2350_HARM_0B_BWE_2

parent 6f9c7587

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_BASOP_2350_HARM_0B_BWE_2                    /* VA: basop issue 2350: Simplify calling of hf_synth_fx() */

#define FIX_2364_HARM_MULT_HARM                         /* VA: basop issue 2364 : harmonizing multi_harm_fx function */

#define FIX_2363_FIND_WSP                               /* VA: basop issue 2363 : harmonizing find_wsp function */

#define FIX_2370_UNUSED_BUFFERS_CORE_ENC                /* VA: basop issue 2370: remove temporary input buffers in core-encoder  */

lib_dec/acelp_core_dec_fx.c

+0 −32
Original line number Diff line number Diff line
@@ -74,9 +74,6 @@ ivas_error acelp_core_dec_fx( 
    const Word16 read_sid_info           /* i  : read SID info flag                          */

)

{

#ifndef FIX_BASOP_2350_HARM_0B_BWE_2

    Word32 synth_fx[960], save_hb_synth_fx[960] /*, bwe_exc_extended_fx[L_FRAME32k + NL_BUFF_OFFSET]*/;

#endif

    Word16 old_exc_fx[L_EXC_DEC], *exc_fx;                                           /* excitation signal buffer              */

    Word16 syn_tmp_fx[L_FRAME16k + L_SUBFR], *psyn_fx;                               /* synthesis signal buffer               */

    Word16 output_frame;                                                             /* frame length at output sampling freq. */
@@ -1898,9 +1895,7 @@ ivas_error acelp_core_dec_fx( 
                              st->stab_fac_fx, &st->stab_fac_smooth_fx, st->coder_type, st->Q_syn, bpf_error_signal_16fx );

        }



#ifdef FIX_BASOP_2350_HARM_0B_BWE_2

        Word32 synth_fx[L_FRAME48k];

#endif

        Word32 syn_tmp_32_fx[L_FRAME16k + L_SUBFR], *syn_32_fx;

        set32_fx( syn_tmp_32_fx, 0, L_FRAME16k + L_SUBFR );

        syn_32_fx = syn_tmp_32_fx + L_SUBFR;
@@ -2056,9 +2051,7 @@ ivas_error acelp_core_dec_fx( 


                cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, synth_fx /*tmp buffer for save_hb_synth_fx[] */, -1, sub( Q11, Q_real ), -10, st->cldfbSynHB );



#ifdef FIX_BASOP_2350_HARM_0B_BWE_2

                Copy_Scale_sig_32_16( synth_fx, save_hb_synth_fx16, output_frame, 0 ); // Q0

#endif



                /* restore lowband */

                FOR( j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
@@ -2210,9 +2203,7 @@ ivas_error acelp_core_dec_fx( 
            Copy( psyn_fx, output_fx, st->L_frame ); /*Q_syn*/

        }



#ifdef FIX_BASOP_2350_HARM_0B_BWE_2

        Copy_Scale_sig_32_16( synth_fx, synth_fx16, output_frame, 0 ); // Q_syn2

#endif

        st->Q_syn2 = 0;

        move16();

    }
@@ -2233,20 +2224,7 @@ ivas_error acelp_core_dec_fx( 
        IF( ( EQ_16( st->L_frame, L_FRAME ) && ( st->bwidth != NB ) && GE_16( output_frame, L_FRAME16k ) &&

              ( EQ_16( st->extl, -1 ) || EQ_16( st->extl, SWB_CNG ) || ( EQ_16( st->extl, WB_BWE ) && st->extl_brate == 0 && NE_16( st->coder_type, AUDIO ) ) ) ) )

        {

#ifdef FIX_BASOP_2350_HARM_0B_BWE_2

            hf_synth_fx( st->hBWE_zero, st->element_mode, st->core_brate, output_frame, Aq_fx, exc2_fx, psyn_fx, synth_fx16, st->Q_exc, st->Q_syn2 );

#else

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

            {

                hf_synth_fx( st->hBWE_zero, EVS_MONO, st->core_brate, output_frame, Aq_fx, exc2_fx, psyn_fx, synth_fx16, st->Q_exc, st->Q_syn2 );

            }

            ELSE

            {

                Copy_Scale_sig_32_16( synth_fx, synth_fx16, output_frame, 0 ); // Q0

            hf_synth_fx( st->hBWE_zero, st->element_mode, st->core_brate, output_frame, Aq_fx, exc2_fx, psyn_fx, synth_fx16, st->Q_exc, st->Q_syn2 );

                Copy_Scale_sig_16_32_DEPREC( synth_fx16, synth_fx, output_frame, 0 );

            }

#endif

        }

        ELSE

        {
@@ -2342,16 +2320,6 @@ ivas_error acelp_core_dec_fx( 
        }

    }



#ifndef FIX_BASOP_2350_HARM_0B_BWE_2

    IF( NE_16( st->element_mode, EVS_MONO ) )

    {

        IF( save_hb_synth_fx16 != NULL )

        {

            Copy_Scale_sig_32_16( save_hb_synth_fx, save_hb_synth_fx16, output_frame, 0 ); // Q0

        }

        Copy_Scale_sig_32_16( synth_fx, synth_fx16, output_frame, 0 ); // Q_syn2

    }

#endif

    pop_wmops();

    return error;

}