Implement BASOP W_min and W_max functions. (5477b887) · Commits · SA4 / Audio / IVAS BASOP

lib_basop/enh64.c

+96 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,103 @@
		*****************************************************************************/

		#ifdef ENH_64_BIT_OPERATOR
		/*______________________________________________________________________________
		\| \|
		\| Function Name : W_min \|
		\| \|
		\| Purpose : \|
		\| \|
		\| Compares L64_var1 and L64_var2 and returns the minimum value. \|
		\| \|
		\| Complexity weight : 1 \|
		\| \|
		\| Inputs : \|
		\| \|
		\| L64_var1 64 bit long signed integer (Word64) whose value falls in the \|
		\| range : 0x80000000 00000000LL <= L64_var1 <= 0x7fffffff ffffffffLL. \|
		\| \|
		\| L64_var2 64 bit long signed integer (Word64) whose value falls in the \|
		\| range : 0x80000000 00000000LL <= L64_var2 <= 0x7fffffff ffffffffLL. \|
		\| \|
		\| Outputs : \|
		\| \|
		\| none \|
		\| \|
		\| Return Value : \|
		\| \|
		\| L64_var_out \|
		\| 64 bit long signed integer (Word64) whose value falls in the \|
		\| range : 0x80000000 00000000LL <= L64_var_out <= 0x7fffffff ffffffffLL. \|
		\|______________________________________________________________________________\|
		*/
		Word64 W_min( Word64 L64_var1, Word64 L64_var2 )
		{
		Word64 L64_var_out;

		if ( L64_var1 <= L64_var2 )
		{
		L64_var_out = L64_var1;
		}
		else
		{
		L64_var_out = L64_var2;
		}

		#ifdef WMOPS
		multiCounter[currCounter].W_min++;
		#endif /* ifdef WMOPS */

		return ( L64_var_out );
		}

		/*______________________________________________________________________________
		\| \|
		\| Function Name : W_max \|
		\| \|
		\| Purpose : \|
		\| \|
		\| Compares L64_var1 and L64_var2 and returns the maximum value. \|
		\| \|
		\| Complexity weight : 1 \|
		\| \|
		\| Inputs : \|
		\| \|
		\| L64_var1 64 bit long signed integer (Word64) whose value falls in the \|
		\| range : 0x80000000 00000000LL <= L64_var1 <= 0x7fffffff ffffffffLL. \|
		\| \|
		\| L64_var2 64 bit long signed integer (Word64) whose value falls in the \|
		\| range : 0x80000000 00000000LL <= L64_var2 <= 0x7fffffff ffffffffLL. \|
		\| \|
		\| Outputs : \|
		\| \|
		\| none \|
		\| \|
		\| Return Value : \|
		\| \|
		\| L64_var_out \|
		\| 64 bit long signed integer (Word64) whose value falls in the \|
		\| range : 0x80000000 00000000LL <= L64_var_out <= 0x7fffffff ffffffffLL. \|
		\|______________________________________________________________________________\|
		*/
		Word64 W_max( Word64 L64_var1, Word64 L64_var2 )
		{
		Word64 L64_var_out;

		if ( L64_var1 >= L64_var2 )
		{
		L64_var_out = L64_var1;
		}
		else
		{
		L64_var_out = L64_var2;
		}

		#ifdef WMOPS
		multiCounter[currCounter].W_max++;
		#endif /* ifdef WMOPS */

		return ( L64_var_out );
		}

		/*___________________________________________________________________________
		\| \|
		@@ -84,7 +180,6 @@ Word64 W_add_nosat( Word64 L64_var1, Word64 L64_var2 )
		return L64_var_out;
		}


		/*___________________________________________________________________________
		\| \|
		\| Function Name : W_sub_nosat \|

lib_basop/enh64.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@
		*
		*****************************************************************************/
		#ifdef ENH_64_BIT_OPERATOR
		Word64 W_min( Word64 L64_var1, Word64 L64_var2 );
		Word64 W_max( Word64 L64_var1, Word64 L64_var2 );
		Word64 W_add_nosat( Word64 L64_var1, Word64 L64_var2 );
		Word64 W_sub_nosat( Word64 L64_var1, Word64 L64_var2 );
		Word64 W_shl( Word64 L64_var1, Word16 var2 );

lib_debug/wmc_auto.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ static BASIC_OP op_weight = {
		#ifdef ENH_64_BIT_OPERATOR
		/* Weights of new 64 bit basops */
		,
		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
		#endif /* #ifdef ENH_64_BIT_OPERATOR */

		#ifdef ENH_32_BIT_OPERATOR

lib_debug/wmc_auto.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -877,6 +877,8 @@ typedef struct
		/* New 64 bit basops */
		#ifdef ENH_64_BIT_OPERATOR
		unsigned int move64; /* Complexity Weight of 1 */
		unsigned int W_min; /* Complexity Weight of 1 */
		unsigned int W_max; /* Complexity Weight of 1 */
		unsigned int W_add_nosat; /* Complexity Weight of 1 */
		unsigned int W_sub_nosat; /* Complexity Weight of 1 */
		unsigned int W_shl; /* Complexity Weight of 1 */

Original line number	Diff line number	Diff line
		@@ -40,7 +40,103 @@
		*****************************************************************************/

		#ifdef ENH_64_BIT_OPERATOR
		/*______________________________________________________________________________
		\| \|
		\| Function Name : W_min \|
		\| \|
		\| Purpose : \|
		\| \|
		\| Compares L64_var1 and L64_var2 and returns the minimum value. \|
		\| \|
		\| Complexity weight : 1 \|
		\| \|
		\| Inputs : \|
		\| \|
		\| L64_var1 64 bit long signed integer (Word64) whose value falls in the \|
		\| range : 0x80000000 00000000LL <= L64_var1 <= 0x7fffffff ffffffffLL. \|
		\| \|
		\| L64_var2 64 bit long signed integer (Word64) whose value falls in the \|
		\| range : 0x80000000 00000000LL <= L64_var2 <= 0x7fffffff ffffffffLL. \|
		\| \|
		\| Outputs : \|
		\| \|
		\| none \|
		\| \|
		\| Return Value : \|
		\| \|
		\| L64_var_out \|
		\| 64 bit long signed integer (Word64) whose value falls in the \|
		\| range : 0x80000000 00000000LL <= L64_var_out <= 0x7fffffff ffffffffLL. \|
		\|______________________________________________________________________________\|
		*/
		Word64 W_min( Word64 L64_var1, Word64 L64_var2 )
		{
		Word64 L64_var_out;

		if ( L64_var1 <= L64_var2 )
		{
		L64_var_out = L64_var1;
		}
		else
		{
		L64_var_out = L64_var2;
		}

		#ifdef WMOPS
		multiCounter[currCounter].W_min++;
		#endif /* ifdef WMOPS */

		return ( L64_var_out );
		}

		/*______________________________________________________________________________
		\| \|
		\| Function Name : W_max \|
		\| \|
		\| Purpose : \|
		\| \|
		\| Compares L64_var1 and L64_var2 and returns the maximum value. \|
		\| \|
		\| Complexity weight : 1 \|
		\| \|
		\| Inputs : \|
		\| \|
		\| L64_var1 64 bit long signed integer (Word64) whose value falls in the \|
		\| range : 0x80000000 00000000LL <= L64_var1 <= 0x7fffffff ffffffffLL. \|
		\| \|
		\| L64_var2 64 bit long signed integer (Word64) whose value falls in the \|
		\| range : 0x80000000 00000000LL <= L64_var2 <= 0x7fffffff ffffffffLL. \|
		\| \|
		\| Outputs : \|
		\| \|
		\| none \|
		\| \|
		\| Return Value : \|
		\| \|
		\| L64_var_out \|
		\| 64 bit long signed integer (Word64) whose value falls in the \|
		\| range : 0x80000000 00000000LL <= L64_var_out <= 0x7fffffff ffffffffLL. \|
		\|______________________________________________________________________________\|
		*/
		Word64 W_max( Word64 L64_var1, Word64 L64_var2 )
		{
		Word64 L64_var_out;

		if ( L64_var1 >= L64_var2 )
		{
		L64_var_out = L64_var1;
		}
		else
		{
		L64_var_out = L64_var2;
		}

		#ifdef WMOPS
		multiCounter[currCounter].W_max++;
		#endif /* ifdef WMOPS */

		return ( L64_var_out );
		}

		/*___________________________________________________________________________
		\| \|
		@@ -84,7 +180,6 @@ Word64 W_add_nosat( Word64 L64_var1, Word64 L64_var2 )
		return L64_var_out;
		}


		/*___________________________________________________________________________
		\| \|
		\| Function Name : W_sub_nosat \|