Commit 0647932f authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2429_POST_DECODER

parent fbccb1e5

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#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_2429_POST_DECODER

#define FIX_FLOAT_1526_DIRAC_MEM_LEAK                   /* FhG: float issue 1526: potential memory leak in DirAC handles in case of format switching */

#define FIX_2437_HARMONIZE_ENCODERINDEX                 /* FhG: basop issue 2437 EncoderIndex_ivas_fx() and EncoderIndex_fx()*/

#define FIX_2385_GETTCXONLY                             /* FhG: issue 2385 : harmonizing getTcxonly_ivas_fx() and getTcxonly_ivas_fx() functions */

lib_com/prot_fx.h

+0 −13
Original line number Diff line number Diff line
@@ -7330,20 +7330,7 @@ Word16 FEC_pos_dec_fx( 
    const Word16 nBits_es_Pred /* i  : number of bits for Es_pred Q                */

);



#ifndef FIX_2429_POST_DECODER

void post_decoder(

    Decoder_State *st,

    Word16 synth_buf[],   /* Q0 */

    Word16 pit_gain[],    /* Q14 */

    Word16 pitch[],       /* Q0 */

    Word16 signal_out[],  /* Q0 */

    Word16 *bpf_noise_buf /* Q0 */

);



void post_decoder_ivas_fx(

#else

void post_decoder_fx(

#endif

    Decoder_State *st,

    Word16 synth_buf[],   // Q0

    Word16 pit_gain[],    // Q14

lib_dec/dec_LPD_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -954,11 +954,7 @@ void decoder_LPD_fx( 
    st->last_is_cng = 0;



    /* Postfiltering */

#ifdef FIX_2429_POST_DECODER

    post_decoder_fx( st, synth_buf, pit_gain, pitch, signal_out, bpf_noise_buf );

#else

    post_decoder( st, synth_buf, pit_gain, pitch, signal_out, bpf_noise_buf );

#endif



    IF( signal_outFB )

    {

lib_dec/ivas_mdct_core_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1398,11 +1398,7 @@ void ivas_mdct_core_reconstruct_fx( 
            Copy_Scale_sig_32_16( st->p_bpf_noise_buf_32, st->p_bpf_noise_buf, st->L_frame, -Q11 ); // Q11 -> Q0

        }



#ifdef FIX_2429_POST_DECODER

        post_decoder_fx( st, synth_buf_fx, pit_gain_fx[ch], pitch[ch], x_fx_16, st->p_bpf_noise_buf );

#else

        post_decoder_ivas_fx( st, synth_buf_fx, pit_gain_fx[ch], pitch[ch], x_fx_16, st->p_bpf_noise_buf );

#endif



        IF( st->p_bpf_noise_buf_32 )

        {

lib_dec/ivas_tcx_core_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -784,11 +784,7 @@ void stereo_tcx_core_dec_fx( 


    /* Postfiltering */



#ifdef FIX_2429_POST_DECODER

    post_decoder_fx( st, synth_buf_fx, pit_gain_fx, pitch, signal_out_fx, st->p_bpf_noise_buf );

#else

    post_decoder( st, synth_buf_fx, pit_gain_fx, pitch, signal_out_fx, st->p_bpf_noise_buf );

#endif



    test();

    IF( st->p_bpf_noise_buf_32 && st->tcxonly == 0 )