Addressed Thomas Dettbarn's comments. (2c4146bd) · Commits · SA4 / Audio / IVAS BASOP

lib_basop/enh64.c

+0 −97

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

		#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 );
		}

		/*___________________________________________________________________________
		\| \|

lib_basop/enh64.h

+102 −2

Original line number	Diff line number	Diff line
		@@ -21,8 +21,108 @@
		*
		*****************************************************************************/
		#ifdef ENH_64_BIT_OPERATOR
		Word64 W_min( Word64 L64_var1, Word64 L64_var2 );
		Word64 W_max( Word64 L64_var1, Word64 L64_var2 );


		/*______________________________________________________________________________
		\| \|
		\| 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. \|
		\|______________________________________________________________________________\|
		*/
		static __inline 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. \|
		\|______________________________________________________________________________\|
		*/
		static __inline 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 );
		}


		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 );

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

		#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 );
		}

		/*___________________________________________________________________________
		\| \|

Original line number	Diff line number	Diff line
		@@ -21,8 +21,108 @@
		*
		*****************************************************************************/
		#ifdef ENH_64_BIT_OPERATOR
		Word64 W_min( Word64 L64_var1, Word64 L64_var2 );
		Word64 W_max( Word64 L64_var1, Word64 L64_var2 );


		/*______________________________________________________________________________
		\| \|
		\| 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. \|
		\|______________________________________________________________________________\|
		*/
		static __inline 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. \|
		\|______________________________________________________________________________\|
		*/
		static __inline 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 );
		}


		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 );