Commit ab56f10a authored by multrus's avatar multrus
Browse files

Merge branch 'basop-2429-harmonize-post_decoder_ivas_fx-and-post_decoder_fx' into 'main' 

[non-BE] harmonize-post_decoder_ivas_fx-and-post_decoder_fx

See merge request !2826
parents bae8cbed 78d94972

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ 
#define HARMONIZE_TBE2                                  /* VA: basop issue 2399: Remove duplicated code: TBE, step 2 */

#define HARMONIZE_2427_GETPLC                           /* FhG: basop issue : 2427 Harmonizing getPLCDecision functions:*/

#define HARM_FD_BWE                                     /* VA: harmonize core-coder FD BWE function duplications */

#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

+4 −0
Original line number Diff line number Diff line
@@ -7394,6 +7394,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 */
@@ -7404,6 +7405,9 @@ void post_decoder( 
);



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

+4 −0
Original line number Diff line number Diff line
@@ -954,7 +954,11 @@ 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

+4 −0
Original line number Diff line number Diff line
@@ -1402,7 +1402,11 @@ 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

+4 −0
Original line number Diff line number Diff line
@@ -788,7 +788,11 @@ 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 )