Commit 79cc0ba4 authored by multrus's avatar multrus
Browse files

disable BASOP_Util_Divide3232_Scale_cadence()

parent 99e792d1

lib_com/basop_util.c

+2 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,7 @@ Word32 div_w( Word32 L_num, Word32 L_den ) 
    }

}



#ifndef REMOVE_BASOP_Util_Divide3232_Scale_cadence

Word32 BASOP_Util_Divide3232_Scale_cadence( Word32 x, Word32 y, Word16 *s )

{

    Word32 z;
@@ -1061,6 +1062,7 @@ Word32 BASOP_Util_Divide3232_Scale_cadence( Word32 x, Word32 y, Word16 *s ) 


    return z;

}

#endif



#ifdef DIV32_OPT_NEWTON

Word32 div_w_newton( Word32 num, Word32 den );

lib_com/basop_util.h

+2 −0
Original line number Diff line number Diff line
@@ -328,9 +328,11 @@ Word16 BASOP_Util_Divide3232_Scale( Word32 x, /*!< i : Numerator*/ 
                                    Word32 y,    /*!< i  : Denominator*/

                                    Word16 *s ); /*!< o  : Additional scalefactor difference*/



#ifndef REMOVE_BASOP_Util_Divide3232_Scale_cadence

Word32 BASOP_Util_Divide3232_Scale_cadence( Word32 x,    /*!< i  : Numerator*/

                                            Word32 y,    /*!< i  : Denominator*/

                                            Word16 *s ); /*!< o  : Additional scalefactor difference*/

#endif





#ifdef DIV32_OPT_NEWTON

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ 
#define HARM_ENC_INIT

//#define HARM_SCE_INIT

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

#define REMOVE_BASOP_Util_Divide3232_Scale_cadence     /* remove this division variant */

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