Commit 7bddc36a authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Revert "delete... 

Revert "delete FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_TEST_ALLIVAS, FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_saturationmode2, made FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2 permanent active. WMOPS for bitstream in issue 1439: general patch: .9 WMOPS - nonBE, no regressions, STAGE2 patch: 3.2 WMOPS - 1 small regression"

This reverts commit c00e57f2.
parent 38e2cb22

lib_com/options.h

+5 −2
Original line number Diff line number Diff line
@@ -88,8 +88,11 @@ 


#define TEST_HR



#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic              /*FhG: nonBE, 0 regressions - reduces maintenance complexity & reduces WMOPS & prepares STAGE2 patch*/

//#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2       /*FhG: nonBE, 1 regression (Pipeline #51485) - reduces 3.2 WMOPS with issue 1439 Bitstream*/

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



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

#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_saturationmode2

  #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,7 +3306,11 @@ 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

);

































lib_com/swb_tbe_com_fx.c



+63
−0




























Original line number
Diff line number
Diff line








@@ -6696,7 +6696,11 @@ 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,









@@ -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++ )















            {









@@ -6776,7 +6791,11 @@ void elliptic_bpf_48k_generic_fx(













                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 3], full_band_bpf_fx[3][3] );















                W_tmpX = W_mac_16_16( W_tmpX, input_fx[i], full_band_bpf_fx[0][0] );















                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 4], full_band_bpf_fx[3][4] );













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_saturationmode2













                L_tmp[i] = W_sat_l( W_add( W_shr( W_tmpX, 3 ), W_shl( W_tmpY, 2 - 16 ) ) ); /*Q_input_fx + 11*/













#else















                L_tmp[i] = W_sat_l( W_shr( W_add( W_tmpX, W_shl( W_tmpY, 2 - 16 + 3 ) ), 3 ) ); /*Q_input_fx + 11*/













#endif















                move32();















            }















        }









@@ -6801,7 +6820,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; )















            {









@@ -6811,7 +6834,11 @@ void elliptic_bpf_48k_generic_fx(













                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 3], full_band_bpf_fx[3][3] );















                W_tmpX = W_mac_16_16( W_tmpX, input_fx[i], full_band_bpf_fx[0][0] );















                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 4], full_band_bpf_fx[3][4] );













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_saturationmode2













                L_tmp[i] = W_sat_l( W_add( W_shr( W_tmpX, 3 ), W_shl( W_tmpY, 2 - 16 ) ) ); /*Q_input_fx + 11*/













#else















                L_tmp[i] = W_sat_l( W_shr( W_add( W_tmpX, W_shl( W_tmpY, 2 - 16 + 3 ) ), 3 ) ); /*Q_input_fx + 11*/













#endif















                move32();















                i++;

























@@ -6821,7 +6848,11 @@ void elliptic_bpf_48k_generic_fx(













                W_tmpX = W_mac_16_16( W_tmpX, input_fx[i - 1], full_band_bpf_fx[0][1] );















                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 3], full_band_bpf_fx[3][3] );















                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 4], full_band_bpf_fx[3][4] );













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_saturationmode2













                L_tmp[i] = W_sat_l( W_add( W_shr( W_tmpX, 3 ), W_shl( W_tmpY, 2 - 16 ) ) ); /*Q_input_fx + 11*/













#else















                L_tmp[i] = W_sat_l( W_shr( W_add( W_tmpX, W_shl( W_tmpY, 2 - 16 + 3 ) ), 3 ) ); /*Q_input_fx + 11*/













#endif















                move32();















                i++;

























@@ -6830,7 +6861,11 @@ void elliptic_bpf_48k_generic_fx(













                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 2], full_band_bpf_fx[3][2] );















                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 3], full_band_bpf_fx[3][3] );















                W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 4], full_band_bpf_fx[3][4] );













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_saturationmode2













                L_tmp[i] = W_sat_l( W_add( W_shr( W_tmpX, 3 ), W_shl( W_tmpY, 2 - 16 ) ) ); /*Q_input_fx + 11*/













#else















                L_tmp[i] = W_sat_l( W_shr( W_add( W_tmpX, W_shl( W_tmpY, 2 - 16 + 3 ) ), 3 ) ); /*Q_input_fx + 11*/













#endif















                move32();















                i++;















            }










@@ -6941,7 +6976,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++ )















        {









@@ -6954,7 +6993,11 @@ void elliptic_bpf_48k_generic_fx(













            W_tmpY = W_msu_32_16( W_tmpY, L_tmp2[i - 3], full_band_bpf_fx[4][3] );















            W_tmpX = W_mac_32_16( W_tmpX, L_tmp[i], full_band_bpf_fx[1][0] );















            W_tmpY = W_msu_32_16( W_tmpY, L_tmp2[i - 4], full_band_bpf_fx[4][4] );













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_saturationmode2













            L_tmp2[i] = W_sat_l( W_add( W_shr( W_tmpX, 3 ), W_shl( W_tmpY, 2 - 16 ) ) ); /*Q_input_fx + 11*/













#else















            L_tmp2[i] = W_sat_l( W_shr( W_add( W_tmpX, W_shl( W_tmpY, 2 - 16 + 3 + 16 ) ), 3 + 16 ) );













#endif















            move32();















            L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[i] ) );















        }










@@ -7074,7 +7117,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++ )















        {









@@ -7087,7 +7134,11 @@ void elliptic_bpf_48k_generic_fx(













            W_tmpY = W_msu_32_16( W_tmpY, L_output[i - 3], full_band_bpf_fx[5][3] );















            W_tmpX = W_mac_32_16( W_tmpX, L_tmp2[i], full_band_bpf_fx[2][0] );















            W_tmpY = W_msu_32_16( W_tmpY, L_output[i - 4], full_band_bpf_fx[5][4] );













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_saturationmode2













            L_output[i] = W_sat_l( W_add( W_shr( W_tmpX, 3 ), W_shl( W_tmpY, 2 - 16 ) ) ); /*Q_input_fx + 11*/













#else















            L_output[i] = W_sat_l( W_shr( W_add( W_tmpX, W_shl( W_tmpY, 2 - 16 + 3 + 16 ) ), 3 + 16 ) );













#endif















            move32();















            L_tmpMax = L_max( L_tmpMax, L_abs( L_output[i] ) );















        }










@@ -7250,7 +7301,11 @@ 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















)















{










@@ -7288,7 +7343,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









@@ -7304,7 +7363,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
−0




























Original line number
Diff line number
Diff line








@@ -4646,8 +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_USEELEMENTMODE















                                ,















                                st->element_mode













#else













                                ,













                                0













#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE*/















#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/















    );


























@@ -4720,8 +4725,13 @@ 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 /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_USEELEMENTMODE*/















#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/















    );

















































lib_enc/swb_tbe_enc_fx.c



+12
−0




























Original line number
Diff line number
Diff line








@@ -7333,7 +7333,11 @@ 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_USEELEMENTMODE















        st->element_mode,













#else













        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 );










@@ -7471,7 +7475,11 @@ 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













#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 );









@@ -7484,7 +7492,11 @@ 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













#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 );