Commit 627abb06 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

use FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE

parent 05e1ec7d

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
#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_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*/

  #define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE /*according to comment of @vaclav in MR!1390*/ /*overrides STAGE2 settings*/

    //#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*/

#endif

lib_com/prot_fx.h

+8 −0
Original line number Diff line number Diff line
@@ -3267,7 +3267,11 @@ void wb_tbe_extras_reset_synth_fx( Word16 state_lsyn_filt_shb[], Word16 state_ls 
#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

#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE

  const int16_t element_mode,

#else

    Word16 isIVAS,

#endif

#endif

    Word16 IsUpsampled3,

    Word16 input_fx[], /* i  : input signal                             Q_input_fx*/
@@ -3302,8 +3306,12 @@ void synthesise_fb_high_band_fx( 
    Word16 Qout

#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2

    ,

#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE

  int16_t element_mode

#else

    Word16 isIVAS

#endif

#endif

);















void prep_tbe_exc_fx(

































lib_com/swb_tbe_com_fx.c



+39
−4




























Original line number
Diff line number
Diff line








@@ -6696,8 +6696,12 @@ void wb_tbe_extras_reset_synth_fx(





























void 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_USEELEMENTMODE













  int16_t element_mode,













#else















    Word16 isIVAS,















#endif













#endif















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















    Word16 IsUpsampled3,















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









@@ -6711,6 +6715,13 @@ void elliptic_bpf_48k_generic_fx(













    const Word16 full_band_bpf_fx[][5] /* i  : filter coefficients b0,b1,b2,a0,a1,a2  Q13  */















)















{













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_TEST_ALLIVAS













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE













    element_mode = 1;













#else













    isIVAS = 1;













#endif













#endif















    Word16 i, j;















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















    Word16 memory_fx0, Q_temp, Q_temp2;










@@ -6762,7 +6773,11 @@ void elliptic_bpf_48k_generic_fx(













    IF( !IsUpsampled3 )















    {















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE













        IF(element_mode)













#else















        IF( isIVAS )













#endif















        {















            FOR( i = 0; i < L_FRAME48k; i++ )















            {










@@ -6801,7 +6816,11 @@ void elliptic_bpf_48k_generic_fx(













    ELSE















    {















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE













        IF(element_mode)













#else















        IF( isIVAS )













#endif















        {















            FOR( i = 0; i < L_FRAME48k; )















            {










@@ -6941,7 +6960,11 @@ void elliptic_bpf_48k_generic_fx(













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















    L_tmpMax = L_add( 0, 0 );















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE













    IF(element_mode)













#else















    IF( isIVAS )













#endif















    {















        FOR( i = 0; i < L_FRAME48k; i++ )















        {










@@ -7074,7 +7097,11 @@ void elliptic_bpf_48k_generic_fx(













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















    L_tmpMax = L_add( 0, 0 );















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE













    IF(element_mode)













#else















    IF( isIVAS )













#endif















    {















        FOR( i = 0; i < L_FRAME48k; i++ )















        {










@@ -7250,8 +7277,12 @@ void synthesise_fb_high_band_fx(













    Word16 Qout















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2















    ,













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE













    int16_t element_mode













#else















    Word16 isIVAS















#endif













#endif















)















{















    Word16 i, j;









@@ -7267,10 +7298,6 @@ void synthesise_fb_high_band_fx(













    Word32 L_tmp;















    Word16 tmp3, tmp1, tmp2, exp, exp2, exp_tmp;





























#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_TEST_ALLIVAS













    isIVAS = 1;













#endif





























    /* Interpolate the white energy shaped gaussian excitation from 16 kHz to 48 kHz with zeros */















    j = 0;















    /* white excitation from DC to 8 kHz resampled to produce DC to 24 kHz excitation.          */









@@ -7292,7 +7319,11 @@ void synthesise_fb_high_band_fx(













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













            element_mode  ,













#else















            isIVAS,













#endif















#endif















            1, // IsUpsampled3















            excitation_in_interp3, &exp_tmp, tmp, bpf_memory, bpf_memory_Q, full_band_bpf_3_fx









@@ -7308,7 +7339,11 @@ void synthesise_fb_high_band_fx(













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













            element_mode,













#else















            isIVAS,













#endif















#endif















            1, // IsUpsampled3















            excitation_in_interp3, &exp_tmp, tmp, bpf_memory, bpf_memory_Q, full_band_bpf_1_fx );

































lib_dec/swb_tbe_dec_fx.c



+10
−6




























Original line number
Diff line number
Diff line








@@ -4646,14 +4646,13 @@ void fb_tbe_dec_fx(













    /* FB TBE synthesis */















    synthesise_fb_high_band_fx( fb_exc, Q_fb_exc, fb_synth, fb_exc_energy, ratio, st->L_frame, st->bfi, &( hBWE_TD->prev_fbbwe_ratio_fx ), hBWE_TD->fbbwe_hpf_mem_fx, hBWE_TD->fbbwe_hpf_mem_fx_Q, hb_synth_exp















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_TEST_ALLIVAS













                                ,













                                1













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE













      ,st->element_mode















#else















                                ,















                                0













#endif













#endif













#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE*/













#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/















    );































    /* add the fb_synth component to the hb_synth component */










@@ -4725,9 +4724,14 @@ void fb_tbe_dec_ivas_fx(













    /* FB TBE synthesis */















    synthesise_fb_high_band_fx( fb_exc, Q_fb_exc, fb_synth, fb_exc_energy, ratio, st->L_frame, st->bfi, &( hBWE_TD->prev_fbbwe_ratio_fx ), hBWE_TD->fbbwe_hpf_mem_fx, hBWE_TD->fbbwe_hpf_mem_fx_Q, hb_synth_exp















#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE













                                ,













                                st->element_mode













#else















                                ,















                                1













#endif













#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE*/













#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/















    );































    test();

































lib_enc/swb_tbe_enc_fx.c



+17
−9




























Original line number
Diff line number
Diff line








@@ -7333,12 +7333,12 @@ void fb_tbe_enc_fx(













#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













        1, // isIVAS













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE













        st->element_mode,















#else













        0, // isIVAS













#endif













#endif













        0,













#endif       /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE*/













#endif       /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/















        0, // IsUpsampled3















        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










@@ -7475,8 +7475,12 @@ void fb_tbe_enc_ivas_fx(













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













            st->element_mode,













#else













            1,













#endif           /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE*/













#endif           /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/















            0, // IsUpsampled3















            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









@@ -7488,8 +7492,12 @@ void fb_tbe_enc_ivas_fx(













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













            st->element_mode,













#else













            1,













#endif           /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE*/













#endif           /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/















            0, // IsUpsampled3















            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