prepare lib_com for wmc_tools usage (87afc44c) · Commits · SA4 / Audio / IVAS BASOP

lib_com/basop32.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -896,11 +896,10 @@ Word16 shl_sat( Word16 var1, Word16 var2 )
		*/
		#ifdef BASOP_NOGLOB
		Word16 shr_o( Word16 var1, Word16 var2, Flag *Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word16 shr( Word16 var1, Word16 var2 )
		{
		#endif /* BASOP_NOGLOB */
		{
		Word16 var_out;

		if ( var2 < 0 )
		@@ -995,11 +994,10 @@ Word16 shr_sat( Word16 var1, Word16 var2 )
		*/
		#ifdef BASOP_NOGLOB
		Word16 mult_o( Word16 var1, Word16 var2, Flag *Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word16 mult( Word16 var1, Word16 var2 )
		{
		#endif /* BASOP_NOGLOB */
		{
		Word16 var_out;
		Word32 L_product;

		@@ -1589,11 +1587,10 @@ Word32 DEPR_L_macNs( Word32 L_var3, Word16 var1, Word16 var2, Flag *Carry )
		#endif
		#ifdef BASOP_NOGLOB
		Word32 L_macNs_co( Word32 L_var3, Word16 var1, Word16 var2, Flag Carry, Flag Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word32 L_macNs( Word32 L_var3, Word16 var1, Word16 var2 )
		{
		#endif /* BASOP_NOGLOB */
		{
		Word32 L_var_out;

		#ifdef BASOP_NOGLOB

lib_com/core_com_config.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,9 @@ Word16 getTcxonly(
		tcxonly = 1;
		}
		break;
		#endif
		#ifdef IVAS_CODE_SWITCHING
		}
		#endif
		return tcxonly;
		}

lib_com/enh1632.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -382,11 +382,10 @@ Word32 L_lshr( Word32 L_var1, Word16 var2 )
		*****************************************************************************/
		#ifdef BASOP_NOGLOB
		Word16 shl_ro( Word16 var1, Word16 var2, Flag *Overflow )
		{
		#else
		Word16 shl_r( Word16 var1, Word16 var2 )
		{
		#endif
		{
		Word16 var_out;

		if ( var2 >= 0 )

lib_com/enh64.c

+8 −16

Original line number	Diff line number	Diff line
		@@ -167,11 +167,10 @@ Word64 W_sub_nosat( Word64 L64_var1, Word64 L64_var2 )
		*/
		#ifdef BASOP_NOGLOB
		Word64 W_shl_o( Word64 L64_var1, Word16 var2, Flag *Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word64 W_shl( Word64 L64_var1, Word16 var2 )
		{
		#endif /* BASOP_NOGLOB */
		{

		Word64 L64_var_out = 0LL;

		@@ -1142,11 +1141,10 @@ Word32 W_shl_sat_l( Word64 L64_var, Word16 n )
		*/
		#ifdef BASOP_NOGLOB
		Word32 W_round48_L_o( Word64 L64_var1, Flag *Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word32 W_round48_L( Word64 L64_var1 )
		{
		#endif /* BASOP_NOGLOB */
		{
		Word64 L64_var_out;
		Word32 L_result;

		@@ -1216,11 +1214,10 @@ Word32 W_round48_L( Word64 L64_var1 )
		*/
		#ifdef BASOP_NOGLOB
		Word16 W_round32_s_o( Word64 L64_var1, Flag *Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word16 W_round32_s( Word64 L64_var1 )
		{
		#endif /* BASOP_NOGLOB */
		{
		Word64 L64_var_out;
		Word32 L_var;
		Word16 var_out;
		@@ -1357,11 +1354,10 @@ Word16 W_norm( Word64 L64_var1 )
		*/
		#ifdef BASOP_NOGLOB
		Word64 W_add_o( Word64 L64_var1, Word64 L64_var2, Flag *Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word64 W_add( Word64 L64_var1, Word64 L64_var2 )
		{
		#endif /* BASOP_NOGLOB */
		{
		Word64 L64_var_out;

		L64_var_out = L64_var1 + L64_var2;
		@@ -1425,11 +1421,10 @@ Word64 W_add( Word64 L64_var1, Word64 L64_var2 )
		*/
		#ifdef BASOP_NOGLOB
		Word64 W_sub_o( Word64 L64_var1, Word64 L64_var2, Flag *Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word64 W_sub( Word64 L64_var1, Word64 L64_var2 )
		{
		#endif /* BASOP_NOGLOB */
		{
		Word64 L64_var_out;

		L64_var_out = L64_var1 - L64_var2;
		@@ -1490,11 +1485,10 @@ Word64 W_sub( Word64 L64_var1, Word64 L64_var2 )
		*/
		#ifdef BASOP_NOGLOB
		Word64 W_neg_o( Word64 L64_var1, Flag *Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word64 W_neg( Word64 L64_var1 )
		{
		#endif /* BASOP_NOGLOB */
		{
		Word64 L64_var_out;

		if ( L64_var1 == MIN_64 )
		@@ -1555,11 +1549,10 @@ Word64 W_neg( Word64 L64_var1 )
		*/
		#ifdef BASOP_NOGLOB
		Word64 W_abs_o( Word64 L64_var1, Flag *Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word64 W_abs( Word64 L64_var1 )
		{
		#endif /* BASOP_NOGLOB */
		{
		Word64 L64_var_out;

		if ( L64_var1 == MIN_64 )
		@@ -1631,11 +1624,10 @@ Word64 W_abs( Word64 L64_var1 )
		*/
		#ifdef BASOP_NOGLOB
		Word64 W_mult_32_32_o( Word32 L_var1, Word32 L_var2, Flag *Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word64 W_mult_32_32( Word32 L_var1, Word32 L_var2 )
		{
		#endif /* BASOP_NOGLOB */
		{
		Word64 L64_var_out;

		if ( ( L_var1 == MIN_32 ) && ( L_var2 == MIN_32 ) )

lib_com/float_to_fix_ops.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		#include "options.h"
		#include "prot.h"
		#include "prot_fx.h"
		#define WMC_TOOL_SKIP

		Word32 floatToFixed( float f, Word16 Q )
		{
		@@ -14,9 +15,9 @@ Word32 floatToFixed( float f, Word16 Q )
		if ( f == 1.0f && Q == Q31 )
		return MAXVAL_WORD32;
		if ( Q < 0 )
		result_32 = (Word64) ( (float) ( f ) / (double) ( 1llu << ( -Q ) ) + ( f >= 0 ? 0.5 : -0.5 ) );
		result_32 = (Word64) ( (float) ( f ) / (double) ( (Word64) 1 << ( -Q ) ) + ( f >= 0 ? 0.5 : -0.5 ) );
		else
		result_32 = (Word64) ( f * (double) ( 1llu << Q ) + ( f >= 0 ? 0.5 : -0.5 ) );
		result_32 = (Word64) ( f * (double) ( ( Word64 )1 << Q ) + ( f >= 0 ? 0.5 : -0.5 ) );
		if ( result_32 > MAX_32 )
		return MAX_32;
		if ( result_32 < MIN_32 )
		@@ -296,3 +297,4 @@ Word16 L_get_q_buf1( float *ptr_flt, Word16 length )
		}
		}
		#endif
		#undef WMC_TOOL_SKIP