activate OPT_BASOP_ADD_v1 again and make everything compile (55424144) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -181,5 +181,5 @@

		//#define OPT_STEREO_32KBPS_V1 /* Optimization made in stereo decoding path for 32kbps decoding */
		#define DOT_PROD_CHOLESKY_64BIT /* FhG: Issue 1323, optimized 64 bit implementation of dot_product_cholesky() */
		//#define OPT_BASOP_ADD_v1 /* optimizations to avoid usage of BASOP_Util_Add_MantExp */
		#define OPT_BASOP_ADD_v1 /* optimizations to avoid usage of BASOP_Util_Add_MantExp */
		#endif

lib_dec/ivas_binRenderer_internal_fx.c

+26 −0

Original line number	Diff line number	Diff line
		@@ -91,7 +91,9 @@ static void ivas_binRenderer_filterModule_fx(
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		filterStatesLeftRealPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftReal_fx[pos_idx][bandIdx][chIdx][0] );
		filterStatesLeftImagPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftImag_fx[pos_idx][bandIdx][chIdx][0] );
		#ifndef OPT_BASOP_ADD_v1
		Q_filterStates = (Word16 *) &( hBinRenderer->hBinRenConvModule->Q_filterStatesLeft[pos_idx][bandIdx][chIdx][0] );
		#endif
		#else
		filterStatesLeftRealPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftReal_fx[bandIdx][chIdx][0] );
		filterStatesLeftImagPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx][0] );
		@@ -367,10 +369,12 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
		}

		#ifndef OPT_BASOP_ADD_v1
		IF( ( hBinRenConvModule->Q_filterStatesLeft = (Word16 ***) malloc( num_poses sizeof( Word16 *** ) ) ) == NULL )
		{
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
		}
		#endif /* OPT_BASOP_ADD_v1 */

		for ( pos_idx = 0; pos_idx < num_poses; pos_idx++ )
		{
		@@ -384,10 +388,12 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
		}

		#ifndef OPT_BASOP_ADD_v1
		IF( ( hBinRenConvModule->Q_filterStatesLeft[pos_idx] = (Word16 **) malloc( hBinRenderer->conv_band sizeof( Word16 ** ) ) ) == NULL )
		{
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
		}
		#endif /* OPT_BASOP_ADD_v1 */

		for ( bandIdx = 0; bandIdx < hBinRenderer->conv_band; bandIdx++ )
		{
		@@ -401,10 +407,12 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
		}

		#ifndef OPT_BASOP_ADD_v1
		IF( ( hBinRenConvModule->Q_filterStatesLeft[pos_idx][bandIdx] = (Word16 *) malloc( hBinRenderer->nInChannels sizeof( Word16 * ) ) ) == NULL )
		{
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
		}
		#endif /* OPT_BASOP_ADD_v1 */

		for ( chIdx = 0; chIdx < hBinRenderer->nInChannels; chIdx++ )
		{
		@@ -418,10 +426,12 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
		}

		#ifndef OPT_BASOP_ADD_v1
		IF( ( hBinRenConvModule->Q_filterStatesLeft[pos_idx][bandIdx][chIdx] = (Word16 ) malloc( hBinRenConvModule->numTapsArray[bandIdx] sizeof( Word16 ) ) ) == NULL )
		{
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
		}
		#endif /* OPT_BASOP_ADD_v1 */
		}
		}
		}
		@@ -609,7 +619,12 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		/* set the memories to zero */
		set32_fx( hBinRenConvModule->filterStatesLeftReal_fx[pos_idx][bandIdx][chIdx], 0, hBinRenConvModule->numTapsArray[bandIdx] );
		set32_fx( hBinRenConvModule->filterStatesLeftImag_fx[pos_idx][bandIdx][chIdx], 0, hBinRenConvModule->numTapsArray[bandIdx] );
		#ifdef OPT_BASOP_ADD_v1
		hBinRenConvModule->Q_filterStatesLeft = 31;
		move16();
		#else /* OPT_BASOP_ADD_v1 */
		set16_fx( hBinRenConvModule->Q_filterStatesLeft[pos_idx][bandIdx][chIdx], 31, hBinRenConvModule->numTapsArray[bandIdx] );
		#endif /* OPT_BASOP_ADD_v1 */
		}
		}
		}
		@@ -625,7 +640,12 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		/* set the memories to zero */
		set32_fx( hBinRenConvModule->filterStatesLeftReal_fx[pos_idx][bandIdx][chIdx], 0, hBinRenConvModule->numTaps );
		set32_fx( hBinRenConvModule->filterStatesLeftImag_fx[pos_idx][bandIdx][chIdx], 0, hBinRenConvModule->numTaps );
		#ifdef OPT_BASOP_ADD_v1
		hBinRenConvModule->Q_filterStatesLeft = 31;
		move16();
		#else /* OPT_BASOP_ADD_v1 */
		set16_fx( hBinRenConvModule->Q_filterStatesLeft[pos_idx][bandIdx][chIdx], 31, hBinRenConvModule->numTaps );
		#endif /* OPT_BASOP_ADD_v1 */
		}
		}
		}
		@@ -1596,9 +1616,11 @@ static void ivas_binRenderer_convModuleClose_fx(

		free( hBinRenConvModule->filterStatesLeftImag_fx[posIdx][bandIdx][chIdx] );
		hBinRenConvModule->filterStatesLeftImag_fx[posIdx][bandIdx][chIdx] = NULL;
		#ifndef OPT_BASOP_ADD_v1

		free( hBinRenConvModule->Q_filterStatesLeft[posIdx][bandIdx][chIdx] );
		hBinRenConvModule->Q_filterStatesLeft[posIdx][bandIdx][chIdx] = NULL;
		#endif /* OPT_BASOP_ADD_v1 */
		}

		free( hBinRenConvModule->filterStatesLeftReal_fx[posIdx][bandIdx] );
		@@ -1606,18 +1628,22 @@ static void ivas_binRenderer_convModuleClose_fx(

		free( hBinRenConvModule->filterStatesLeftImag_fx[posIdx][bandIdx] );
		hBinRenConvModule->filterStatesLeftImag_fx[posIdx][bandIdx] = NULL;
		#ifndef OPT_BASOP_ADD_v1

		free( hBinRenConvModule->Q_filterStatesLeft[posIdx][bandIdx] );
		hBinRenConvModule->Q_filterStatesLeft[posIdx][bandIdx] = NULL;
		#endif /* OPT_BASOP_ADD_v1 */
		}
		free( hBinRenConvModule->filterStatesLeftReal_fx[posIdx] );
		hBinRenConvModule->filterStatesLeftReal_fx[posIdx] = NULL;

		free( hBinRenConvModule->filterStatesLeftImag_fx[posIdx] );
		hBinRenConvModule->filterStatesLeftImag_fx[posIdx] = NULL;
		#ifndef OPT_BASOP_ADD_v1

		free( hBinRenConvModule->Q_filterStatesLeft[posIdx] );
		hBinRenConvModule->Q_filterStatesLeft[posIdx] = NULL;
		#endif /* OPT_BASOP_ADD_v1 */
		}
		#else
		FOR( bandIdx = 0; bandIdx < ( *hBinRenderer )->conv_band; bandIdx++ )