[cleanup] accept FIX_571_REVERB_NOT_ACTIVATED_ISM (9d4a3fd0) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,6 @@
		/* only BE switches wrt operation points tested in selection */

		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#define FIX_571_REVERB_NOT_ACTIVATED_ISM /* Philips: Issue 571: Reverb not activated for discrete and parametric ISM */


		#define FIX_488_SYNC_DELAY /* Eri: Issue 488: Waveform and MD desynchronized in external renderer */

lib_dec/ivas_binRenderer_internal.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -1296,11 +1296,7 @@ ivas_error ivas_binRenderer_open(
		}

		/* Allocate memories needed for reverb module */
		#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		#else
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		#endif
		{
		if ( ( error = ivas_binaural_reverb_open( &( hBinRenderer->hReverb ),
		hBinRenderer->conv_band,
		@@ -1308,11 +1304,7 @@ ivas_error ivas_binRenderer_open(
		&( st_ivas->hRenderConfig->roomAcoustics ),
		st_ivas->hIntSetup.output_config,
		st_ivas->hDecoderConfig->output_Fs,
		#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM
		RENDERER_BINAURAL_FASTCONV,
		#else
		RENDERER_BINAURAL_FASTCONV_ROOM,
		#endif
		st_ivas->hHrtfFastConv,
		st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )
		{

lib_dec/ivas_ism_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -201,7 +201,6 @@ static ivas_error ivas_ism_bitrate_switching(
		{
		return error;
		}
		#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM
		if ( st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		#ifdef FIX_674_MISSING_TABLES_FOR_TDREND_REVERB
		@@ -213,7 +212,6 @@ static ivas_error ivas_ism_bitrate_switching(
		return error;
		}
		}
		#endif
		}
		}
		else
		@@ -294,13 +292,11 @@ static ivas_error ivas_ism_bitrate_switching(
		st_ivas->hHrtfTD = NULL;
		}

		#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM
		if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		ivas_reverb_close( &st_ivas->hReverb );
		}

		#endif
		}
		}
		else

lib_dec/ivas_output_config.c

+0 −28

Original line number	Diff line number	Diff line
		@@ -89,15 +89,11 @@ void ivas_renderer_select(
		{
		if ( st_ivas->ism_mode == ISM_MODE_PARAM )
		{
		#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM
		if ( output_config == AUDIO_CONFIG_BINAURAL
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		\|\| output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM
		#endif
		)
		#else
		if ( output_config == AUDIO_CONFIG_BINAURAL \|\| output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		#endif
		{
		*renderer_type = RENDERER_BINAURAL_PARAMETRIC;
		}
		@@ -123,19 +119,11 @@ void ivas_renderer_select(
		else
		{
		*renderer_type = RENDERER_BINAURAL_OBJECTS_TD;
		#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM
		*internal_config = output_config;
		#else
		*internal_config = AUDIO_CONFIG_BINAURAL;
		#endif
		}
		#else
		*renderer_type = RENDERER_BINAURAL_OBJECTS_TD;
		#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM
		*internal_config = output_config;
		#else
		*internal_config = AUDIO_CONFIG_BINAURAL;
		#endif
		#endif
		}
		else
		@@ -183,19 +171,11 @@ void ivas_renderer_select(
		#endif
		{
		*internal_config = AUDIO_CONFIG_HOA3;
		#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM
		if ( output_config == AUDIO_CONFIG_BINAURAL \|\| output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		\|\| output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM
		#endif
		)
		#else
		if ( output_config == AUDIO_CONFIG_BINAURAL
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		\|\| output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM
		#endif
		)
		#endif
		{
		*renderer_type = RENDERER_BINAURAL_FASTCONV;
		}
		@@ -247,19 +227,11 @@ void ivas_renderer_select(
		else
		{
		*internal_config = transport_config;
		#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( output_config == AUDIO_CONFIG_BINAURAL \|\| output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB \|\| output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM \|\| output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED )
		#else
		if ( output_config == AUDIO_CONFIG_BINAURAL \|\| output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		#endif /* SPLIT_REND_WITH_HEAD_ROT */
		#else
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( output_config == AUDIO_CONFIG_BINAURAL \|\| output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		#else
		if ( output_config == AUDIO_CONFIG_BINAURAL )
		#endif /* SPLIT_REND_WITH_HEAD_ROT */
		#endif
		{
		#ifdef DEBUGGING
		if ( ( ( ( st_ivas->transport_config == AUDIO_CONFIG_5_1 \|\| st_ivas->transport_config == AUDIO_CONFIG_7_1 ) && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) ) \|\| ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) ) && ( st_ivas->mc_mode == MC_MODE_MCT \|\| st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) && !( st_ivas->hDecoderConfig->force_rend == FORCE_CLDFB_RENDERER ) )

lib_rend/ivas_reverb.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -1838,11 +1838,7 @@ ivas_error ivas_binaural_reverb_open(
		set_f( hReverb->preDelayBufferImag[k], 0.0f, hReverb->numBins );
		}

		#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM
		if ( renderer_type == RENDERER_BINAURAL_FASTCONV )
		#else
		if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )
		#endif
		{
		if ( !roomAcoustics->override )
		{
		@@ -1929,11 +1925,7 @@ ivas_error ivas_binaural_reverb_open(
		}
		else
		{
		#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM
		if ( renderer_type == RENDERER_BINAURAL_FASTCONV )
		#else
		if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )
		#endif
		{
		ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfFastConv->fastconvReverberationTimes, hHrtfFastConv->fastconvReverberationEneCorrections );
		ivas_binaural_reverb_setPreDelay( hReverb, 10 );