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

del macro FIX_1439_SPEEDUP_sum2_fx_mod

parent b5f196f2

lib_com/prot_fx.h

+1 −2
Original line number Diff line number Diff line
@@ -63,9 +63,8 @@ 
//#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_STAGE2

//#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_STAGE3

//#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig // be       // 2    WMOPS

//#define FIX_1439_SPEEDUP_sum2_fx_mod                              // 3liner   // 0.25 WMOPS













// Numbers ALL:     83,2













// Numbers ALL:     83,45















// Numbers beOnly:  86,156















// NUmbers none:    88,183















































lib_com/swb_tbe_com_fx.c



+0
−3




























Original line number
Diff line number
Diff line








@@ -7178,15 +7178,12 @@ void elliptic_bpf_48k_generic_fx(













    move16();















    move16();















    Q_temp2 = norm_l( L_tmpMax );



























    {















        Scale_sig32( L_output, 960, Q_temp2 );















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















        {















            output_fx[i] = extract_h( L_output[i] );















            move16();















    }













    }















    *Q_input_fx = sub( add( add( *Q_input_fx, Q_temp ), Q_temp2 ), 15 );















    move16(); /* BASOP_NOGLOB */

















































lib_com/tools_fx.c



+1
−16




























Original line number
Diff line number
Diff line








@@ -446,21 +446,6 @@ Word32 sum2_fx_mod(                    /* o  : sum of all squared vector element













                    const Word16 lvec  /* i  : length of input vector                */















)















{













#ifdef FIX_1439_SPEEDUP_sum2_fx_mod













    Word16 i;













    Word64 W_tmp;













#ifdef BASOP_NOGLOB_DECLARE_LOCAL













    Flag Overflow = 0;













    move32();













#endif



























    W_tmp = W_add( 0, 0 );













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













    {













        W_tmp = W_mac_16_16( W_tmp, vec[i], vec[i] );













    }













    return W_sat_l( W_shr( W_tmp, 9 ) );













#else















    Word16 i;















    Word32 L_tmp;















#ifdef BASOP_NOGLOB_DECLARE_LOCAL









@@ -473,8 +458,8 @@ Word32 sum2_fx_mod(                    /* o  : sum of all squared vector element













    {















        L_tmp = L_add_o( L_tmp, L_shr( L_mult_o( vec[i], vec[i], &Overflow ), 9 ), &Overflow );















    }





























    return L_tmp;













#endif















}















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















 * Copy:

































lib_enc/swb_tbe_enc_fx.c



+1
−0




























Original line number
Diff line number
Diff line








@@ -7324,6 +7324,7 @@ void fb_tbe_enc_fx(













    exp_temp = sub( exp_temp, 1 );































    Copy_Scale_sig( new_input, input_fhb, L_FRAME48k, exp_temp );





























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















    Sample_Delay_HP = NS2SA( 48000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) - L_FRAME48k / 2;