Commit f4f3bcaa authored by Fabian Bauer's avatar Fabian Bauer
Browse files

change else path in FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic to old... 

change else path in FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic to old code, delete FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW and change to FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic - deactivate FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
parent ba3a2b47

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ 
#define TEST_HR



//#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic              /*FhG: reduces maintenance complexity & reduces WMOPS & prepares STAGE2 patch*/

//#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW /*activates new, spaghetticode version of elliptic_bpf_48k_generic. if inactive, only old code with no opts is active*/



//#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2       /*FhG: reduces WMOPS*/

//#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_TEST_ALLIVAS  /*Test stage2 macro with all isavas variable = 1 - evs BE test will fail at least*/

lib_com/prot_fx.h

+1 −5
Original line number Diff line number Diff line
@@ -3264,17 +3264,13 @@ void interp_code_4over2_fx( 














void wb_tbe_extras_reset_synth_fx( Word16 state_lsyn_filt_shb[], Word16 state_lsyn_filt_dwn_shb[], Word16 state_32and48k_WB_upsample[], Word16 state_resamp_HB[] );



























#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















void elliptic_bpf_48k_generic_fx(















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2















    Word16 isIVAS,















#endif













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















    Word16 IsUpsampled3,















    Word16 input_fx[], /* i  : input signal                             Q_input_fx*/













#else













    const Word16 input_fx[], /* i  : input signal                             Q_input_fx*/













#endif















    Word16 *Q_input_fx,















    Word16 output_fx[],    /* o  : output signal                               */















    Word32 memory_fx[][4], /* i/o: 4 arrays of 4 for memory                   memory_fx_Q */

































lib_com/swb_tbe_com_fx.c



+73
−339


























File changed.
Preview size limit exceeded, changes collapsed.
























lib_enc/swb_tbe_enc_fx.c



+3
−9




























Original line number
Diff line number
Diff line








@@ -7330,7 +7330,7 @@ void fb_tbe_enc_fx(





























    Copy_Scale_sig( new_input, input_fhb, L_FRAME48k, exp_temp );





























#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















    elliptic_bpf_48k_generic_fx(















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_TEST_ALLIVAS









@@ -7339,9 +7339,7 @@ void fb_tbe_enc_fx(













        0, // isIVAS















#endif















#endif













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















        0, // IsUpsampled3













#endif















        input_fhb, &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );















#else















    elliptic_bpf_48k_generic_fx( input_fhb, &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );










@@ -7474,14 +7472,12 @@ void fb_tbe_enc_ivas_fx(





























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















    {













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















        elliptic_bpf_48k_generic_fx(















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2















            1, // isIVAS















#endif













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















            0, // IsUpsampled3













#endif















            input_fhb_new, &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );















#else















        elliptic_bpf_48k_generic_fx( input_fhb_new, &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );









@@ -7489,14 +7485,12 @@ void fb_tbe_enc_ivas_fx(













    }















    ELSE















    {













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















        elliptic_bpf_48k_generic_fx(















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2















            1, // isIVAS















#endif













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















            0, // IsUpsampled3













#endif















            input_fhb_new + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );















#else















        elliptic_bpf_48k_generic_fx( input_fhb_new + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );