[cleanup] accept FIX_1113_EXTREND_ISAR (18eef161) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -171,7 +171,6 @@
		#define FIX_1377_HANDLE_ERROR_CODE /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */
		#define FIX_1053_REVERB_RECONFIGURATION
		#define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
		#define FIX_1113_EXTREND_ISAR /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */
		#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */
		#define FIX_938_COMPILER_WARNING /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */
		#define FIX_1376_MISSING_ISM_METADATA /* FhG: IVAS_rend: throw error if there exists an ISM input without a corresponding metadata file path */

+0 −4

Original line number	Diff line number	Diff line
		@@ -508,12 +508,8 @@ void rotateFrame_shd_cldfb(
		float realRot[2 * HEADROT_ORDER + 1], imagRot[2 * HEADROT_ORDER + 1];
		float SHrotmat[HEADROT_SHMAT_DIM][HEADROT_SHMAT_DIM];

		#ifdef FIX_1113_EXTREND_ISAR
		assert( ( nInChannels == HOA3_CHANNELS \|\| nInChannels == HOA2_CHANNELS \|\| nInChannels == FOA_CHANNELS ) &&
		"Number of channels must correspond to an ambisonics order!" );
		#else
		assert( nInChannels == HEADROT_SHMAT_DIM && "Number of channels must be 16!" );
		#endif

		/* initialize rotation matrices with zeros */
		for ( i = 0; i < HEADROT_SHMAT_DIM; i++ )

+0 −12

Original line number	Diff line number	Diff line
		@@ -2532,11 +2532,7 @@ static ivas_error updateSbaPanGains(
		{
		if ( hRendCfg->split_rend_config.rendererSelection == IVAS_BIN_RENDERER_TYPE_FASTCONV )
		{
		#ifdef FIX_1113_EXTREND_ISAR
		assert( *rendCtx.pOutSampleRate == 48000 && "split binaural fast conv mode is currently supported with 48k sampling rate only" );
		#else
		assert( inConfig == IVAS_AUDIO_CONFIG_HOA3 && ( *rendCtx.pOutSampleRate == 48000 ) && "split binaural fast conv mode is currently supported with HOA3 input and 48k sampling rate only" );
		#endif
		if ( ( error = ivas_rend_openCldfbRend( &inputSba->cldfbRendWrapper, inConfig, outConfig, &rendCtx.pSplitRendWrapper->multiBinPoseData, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -4216,11 +4212,7 @@ ivas_error IVAS_REND_InitConfig(
		*
		-------------------------------------------------------------------/

		#ifdef FIX_1113_EXTREND_ISAR
		ivas_error IVAS_REND_GetRenderConfig(
		#else
		int16_t IVAS_REND_GetRenderConfig(
		#endif
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS renderer handle */
		const IVAS_RENDER_CONFIG_HANDLE hRCout /* o : Render configuration handle */
		)
		@@ -4284,11 +4276,7 @@ int16_t IVAS_REND_GetRenderConfig(
		*
		-------------------------------------------------------------------/

		#ifdef FIX_1113_EXTREND_ISAR
		ivas_error IVAS_REND_FeedRenderConfig(
		#else
		int16_t IVAS_REND_FeedRenderConfig(
		#endif
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS renderer handle */
		const IVAS_RENDER_CONFIG_DATA renderConfig /* i : Render configuration struct */
		)

+0 −8

Original line number	Diff line number	Diff line
		@@ -252,21 +252,13 @@ ivas_error IVAS_REND_InitConfig(
		const IVAS_AUDIO_CONFIG outAudioConfig /* i : output audioConfig */
		);

		#ifdef FIX_1113_EXTREND_ISAR
		ivas_error IVAS_REND_GetRenderConfig(
		#else
		int16_t IVAS_REND_GetRenderConfig(
		#endif
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS renderer handle */
		const IVAS_RENDER_CONFIG_HANDLE hRCout /* o : Render configuration handle */
		);


		#ifdef FIX_1113_EXTREND_ISAR
		ivas_error IVAS_REND_FeedRenderConfig(
		#else
		int16_t IVAS_REND_FeedRenderConfig(
		#endif
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS renderer handle */
		const IVAS_RENDER_CONFIG_DATA renderConfig /* i : Render configuration struct */
		);