Commit 4bc1b798 authored by vaclav's avatar vaclav
Browse files

REMOVE_EVS_DUPLICATES3

parent b45ca67f

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -156,5 +156,5 @@ 
#define SVD_WMOPS_OPT                           /* Ittiam : SVD related optimizations */



#define REMOVE_EVS_DUPLICATES                   /* remove core-coder duplicated functions */

#define REMOVE_EVS_DUPLICATES2

#define REMOVE_EVS_DUPLICATES3

#endif

lib_com/prot_fx.h

+2 −1
Original line number Diff line number Diff line
@@ -6639,6 +6639,7 @@ void nb_post_filt_fx( 
    const Word16 disable_hpf /* i  : flag to diabled HPF                     */

);













#ifndef REMOVE_EVS_DUPLICATES















void formant_post_filt_fx(















    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */















    Word16 *synth_in,      /* i  : 12k8 synthesis                    */









@@ -6649,7 +6650,7 @@ void formant_post_filt_fx(













    Word32 rate,          /* (i) : bit-rate */















    const Word16 off_flag /* i  : off flag                        */















);

























#endif















void formant_post_filt_ivas_fx(















    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */















    Word16 *synth_in,      /* i  : 12k8 synthesis                    */

































lib_dec/acelp_core_dec_ivas_fx.c



+1
−1




























Original line number
Diff line number
Diff line








@@ -2371,7 +2371,7 @@ ivas_error acelp_core_dec_ivas_fx(













        ELSE















        {















            hf_synth_reset_fx( st->hBWE_zero );













#ifdef REMOVE_EVS_DUPLICATES2













#ifdef REMOVE_EVS_DUPLICATES















            IF( NE_16( st->element_mode, EVS_MONO ) ) // VE: TBV: tmp hack - it is a bug in EVS but conditon is here to keep EVS bit-exact















#endif















            {

































lib_dec/acelp_core_switch_dec_fx.c



+1
−1




























Original line number
Diff line number
Diff line








@@ -920,7 +920,7 @@ static void decod_gen_voic_core_switch_fx(













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































#ifdef REMOVE_EVS_DUPLICATES3













    pitch = pit_decode_ivas_fx( st_fx, core_brate, 0, L_frame, 0, GENERIC, &pitch_limit_flag, &T0, &T0_frac, &T0_min, &T0_max, L_SUBFR ); /*Q6*/













    pitch = pit_decode_ivas_fx( st_fx, core_brate, 0, L_frame, 0, GENERIC, &pitch_limit_flag, &T0, &T0_frac, &T0_min, &T0_max, L_SUBFR, 0, NULL ); /*Q6*/















#else















    pitch = pit_decode_fx( st_fx, core_brate, 0, L_frame, 0, GENERIC, &pitch_limit_flag, &T0, &T0_frac, &T0_min, &T0_max, L_SUBFR ); /*Q6*/















#endif

































lib_dec/dec_post_fx.c



+7
−3




























Original line number
Diff line number
Diff line








@@ -33,8 +33,9 @@ static void calc_st_filt_local_fx( Word16 *apond2, Word16 *apond1, Word16 *parco





























static void modify_pst_param_fx( const Word16 lp_noise, Word16 *g1, Word16 *g2, const Word16 coder_type, Word16 *gain_factor );





























#ifndef REMOVE_EVS_DUPLICATES















static void Dec_formant_postfilt_fx( PFSTAT_HANDLE hPFstat, Word16 *signal_ptr, Word16 *coeff, Word16 *sig_out, Word16 gamma1, Word16 gamma2 );



























#endif















static void Dec_formant_postfilt_ivas_fx( PFSTAT_HANDLE hPFstat, Word16 *signal_ptr, Word16 *coeff, Word16 *sig_out, Word16 gamma1, Word16 gamma2 );































static void calc_st_filt_ivas_fx( Word16 *apond2, Word16 *apond1, Word16 *parcor0, Word16 *sig_ltp_ptr, Word16 *mem_zero, const Word16 extl );










@@ -255,6 +256,8 @@ static void Dec_postfilt_fx(













 *















 *  Main routine to perform formant post filtering















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



























#ifndef REMOVE_EVS_DUPLICATES















void formant_post_filt_fx(















    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */















    Word16 *synth_in,      /* i  : 12k8 synthesis                    */










@@ -379,7 +382,7 @@ void formant_post_filt_fx(













        p_Aq += ( M + 1 );















    }















}



























#endif















void formant_post_filt_ivas_fx(















    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */















    Word16 *synth_in,      /* i  : 12k8 synthesis                    */










@@ -519,6 +522,7 @@ void formant_post_filt_ivas_fx(













 *     k1 = 1st parcor calculated on {hi}















 *     gamma3 = gamma3_minus if k1<0, gamma3_plus if k1>0















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













#ifndef REMOVE_EVS_DUPLICATES















static void Dec_formant_postfilt_fx(















    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */















    Word16 *signal_ptr,    /* i  : input signal (pointer to current subframe Q14*/










@@ -597,7 +601,7 @@ static void Dec_formant_postfilt_fx(





























    return;















}



























#endif















static void Dec_formant_postfilt_ivas_fx(















    PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */















    Word16 *signal_ptr,    /* i  : input signal (pointer to current subframe Q14*/