Commit 0f749376 authored by thomas dettbarn's avatar thomas dettbarn Committed by Sandesh Venkatesh
Browse files

moved the define for the merge request into options.h.

parent 17ea3a46

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,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 MERGE_REQUEST_1472_SPEEDUIP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of dmx calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Requires MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE. */

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

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

lib_enc/ivas_mc_param_enc_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
   the United Nations Convention on Contracts on the International Sales of Goods.



*******************************************************************************************************/

#define MERGE_REQUEST_1472_SPEEDUIP_ivas_mc_param_enc_fx_NONBE

#define CONVERT64( x_64, y_fx, y_e )               \

    {                                              \

        Word16 norm;                               \