Commit 83e6adf7 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

deactivate all speedups

parent 5fe189be

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 
//#define HARM_SCE_INIT

#define DIV32_OPT_NEWTON                               /* FhG: faster 32 by 32 bit division */ 

#define	MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of Cy calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Obsoletes IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE. */

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

#endif

lib_com/swb_tbe_com_fx.c

+28 −1
Original line number Diff line number Diff line
@@ -6687,13 +6687,40 @@ void wb_tbe_extras_reset_synth_fx( 
    return;

}

#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1

inline static void elliptic_bpf_48k_generic_func1( Word16 *input_fx, Word32 *L_tmp, const Word16 full_band_bpf_fx[][5], Word16 IsUpsampled3, Word32 *L_tmpMax )

static inline Word64 wmac_1616( Word64 x1, Word16 x2, Word16 x3 )

{

    return W_mac_16_16( x1, x2, x3 );

}



static inline Word64 wmac_3216( Word64 x1, Word32 x2, Word16 x3 )

{

    return W_mac_32_16( x1, x2, x3 );

}



static inline Word64 wmsu_3216( Word64 x1, Word32 x2, Word16 x3 )

{

    return W_msu_32_16( x1, x2, x3 );

}



inline static void elliptic_bpf_48k_generic_func1( Word16 *input16_fx, Word32 *input32_fx, Word32 *L_tmp, const Word16 full_band_bpf_fx[][5], Word16 IsUpsampled3, Word32 *L_tmpMax )

{

    Word32 L_tmpX;

    Word16 i;

    Word32 L_tmpMax2 = *L_tmpMax;

    Word32 L_tmpAbs;

    move32();



    if(input16_fx > 0)

    {

        Word64 ( *wmac )( Word64, Word16, Word16 );

        Word64 ( *wmsu )( Word64, Word32, Word16 );

    }

    if( input32_fx > 0 )

    {

        Word64 ( *wmac )( Word64, Word32, Word16 );

        Word64 ( *wmsu )( Word64, Word32, Word16 );

    }



    IF( !IsUpsampled3 )

    {

#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2