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

change macros FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig and... 

change macros FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig and FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic to FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic - unrolls still active, loops starting at 4. no speedup functionality yet
parent 884dbfd4

lib_com/options.h

+3 −2
Original line number Diff line number Diff line
@@ -85,8 +85,9 @@ 
#define FIX_1439_SPEEDUP_Copy_Scale_sig_16_32_no_sat            /*FhG: reduces WMOPS - bit-exact*/ //   |

#define FIX_1439_SPEEDUP_stereo_icBWE_dec_fx                    /*FhG: reduces WMOPS - bit-exact*/ //   | 2.4 WMOPS

#define FIX_1439_SPEEDUP_ivas_swb_tbe_dec_fx                    /*FhG: reduces WMOPS - bit-exact*/ //   |

#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig  /*FhG: reduces WMOPS - bit-exact*/ //   |

#define FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic              /*FhG: reduces maintenance complexity */

#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig  /*FhG: reduces WMOPS - bit-exact*/ //   | - TBDeleted, code integrated in FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic

#define FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic              /*FhG: reduces maintenance complexity *//*- TBDeleted, code integrated in FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic*/

#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic              /*FhG: reduces maintenance complexity */



#define FIX_1439_SPEEDUP_synthesise_fb_high_band_fx                                              // |   0.4 WMOPS - BE?

lib_com/prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -3258,7 +3258,7 @@ 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[] );















void elliptic_bpf_48k_generic_fx(













#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















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















#else















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

































lib_com/swb_tbe_com_fx.c



+151
−99




























File changed.
Preview size limit exceeded, changes collapsed.
























lib_enc/swb_tbe_enc_fx.c



+2
−2






























Original line number
Diff line number
Diff line








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













    Word16 tmp, tmp1, tmp2, exp, exp2, exp_norm;















    Word16 s_max_value, exp_temp, i;















    TD_BWE_ENC_HANDLE hBWE_TD = st->hBWE_TD;













#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















    Word16 input_fhb_buffer[L_FRAME48k + 4];















    Word16 *input_fhb = &input_fhb_buffer[0] + 4;















#else










@@ -7427,7 +7427,7 @@ void fb_tbe_enc_ivas_fx(













    Word16 ratio;















    Word16 tmp_vec[L_FRAME48k];















    Word16 idxGain;













#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic













#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic















    Word16 input_fhb_new_buffer[L_FRAME48k + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) + 4];















    Word16 *input_fhb_new = &input_fhb_new_buffer[0] + 4;















#else