[cleanup] accept NONBE_FIX_1045_ISM_BITRATE_SWITCHING (5c6192ad) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,6 @@
		#define FIX_1831_REVERB_REGRESSION /* Philips: fixes reverb regression issues */
		#define FIX_1835_REVERB_ACTIVATION /* FhG: Modified reverberation activation logic and corrected factEQ calculation */
		#define NONBE_FIX_SBA_SIGNALING_BITS_B /* FhG: issue 1061: option B: signal sba order additionally in OSBA */
		#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */
		#define NONBE_FIX_1065_ISM_MD_HANDLE /* VA: issue 1065: Allocate only the necessary number of ISM MD decoder handles. */
		#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */
		#define FIX_1053_REVERB_RECONFIGURATION /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

+0 −13

Original line number	Diff line number	Diff line
		@@ -271,25 +271,12 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
		}

		/* Close the TD Binaural renderer */
		#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING
		ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );

		IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		{
		ivas_reverb_close( &st_ivas->hReverb );
		}
		#else
		IF( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )
		{
		ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );
		st_ivas->hHrtfTD = NULL;

		IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		{
		ivas_reverb_close( &st_ivas->hReverb );
		}
		}
		#endif
		}
		ELSE
		{

+0 −8

Original line number	Diff line number	Diff line
		@@ -1436,15 +1436,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
		test();
		IF( st_ivas->hBinRendererTd != NULL && ( NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_OBJECTS_TD ) ) )
		{
		#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING
		ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );
		#else
		IF( EQ_16( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM, TRUE ) )
		{
		ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );
		st_ivas->hHrtfTD = NULL;
		}
		#endif
		}

		IF( st_ivas->hDiracDecBin[0] != NULL )

+0 −11

Original line number	Diff line number	Diff line
		@@ -738,22 +738,11 @@ ivas_error ivas_omasa_dec_config_fx(
		}
		ELSE
		{
		#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING
		if ( st_ivas->hBinRendererTd != NULL )
		{
		/* TD renderer handle */
		ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );
		}
		#else
		/* TD renderer handle */
		test();
		IF( st_ivas->hBinRendererTd != NULL && EQ_16( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM, TRUE ) )
		{
		ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );

		st_ivas->hHrtfTD = NULL;
		}
		#endif
		/* ISM renderer handle + ISM data handle */
		ivas_omasa_separate_object_renderer_close( st_ivas );
		}

+0 −8

Original line number	Diff line number	Diff line
		@@ -593,15 +593,7 @@ ivas_error ivas_sba_dec_reconfigure_fx(
		/* Time Domain binaural renderer handle */
		IF( st_ivas->hBinRendererTd != NULL )
		{
		#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING
		ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );
		#else
		IF( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )
		{
		ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );
		st_ivas->hHrtfTD = NULL;
		}
		#endif
		}
		nchan_transport_old = add( nchan_transport_old, st_ivas->nchan_ism ); /Q0/
		st_ivas->ism_mode = ISM_MODE_NONE;