[cleanup] accept FIX_587_DEFAULT_REVERB (48583fcc) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -529,9 +529,6 @@ int main(
	fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );
	goto cleanup;		goto cleanup;
	}		}
	#ifndef FIX_587_DEFAULT_REVERB
	renderConfig.roomAcoustics.override = true;
	#endif
	}		}

	/* ISAR frame size is set from command line, not renderer config file.		/* ISAR frame size is set from command line, not renderer config file.

apps/renderer.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1192,9 +1192,6 @@ int main(
	fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );
	goto cleanup;		goto cleanup;
	}		}
	#ifndef FIX_587_DEFAULT_REVERB
	renderConfig.roomAcoustics.override = 1;
	#endif
	}		}

	/* ISAR frame size is set from command line, not renderer config file.		/* ISAR frame size is set from command line, not renderer config file.

lib_com/common_api_types.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -315,9 +315,6 @@ typedef enum

	typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG		typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG
	{		{
	#ifndef FIX_587_DEFAULT_REVERB
	Word16 override;
	#endif
	Word16 nBands; /* Number of frequency bands for which reverb properties are provided, integer, range [2..256] */		Word16 nBands; /* Number of frequency bands for which reverb properties are provided, integer, range [2..256] */
	Word32 pFc_input_fx[IVAS_CLDFB_NO_CHANNELS_MAX]; /Q16 Center frequencies for which following values are provided: /		Word32 pFc_input_fx[IVAS_CLDFB_NO_CHANNELS_MAX]; /Q16 Center frequencies for which following values are provided: /
	Word32 pAcoustic_rt60_fx[IVAS_CLDFB_NO_CHANNELS_MAX]; /Q26 - The room's T60 per center frequency /		Word32 pAcoustic_rt60_fx[IVAS_CLDFB_NO_CHANNELS_MAX]; /Q26 - The room's T60 per center frequency /

lib_com/options.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -87,7 +87,6 @@
	/* #################### Start BASOP porting switches ############################ */		/* #################### Start BASOP porting switches ############################ */

	#define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */		#define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */
	#define FIX_587_DEFAULT_REVERB /* Philips: issue 587: inconsistent default reverb parameters across renderers */
	#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/		#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/
	#define NONBE_FIX_1052_SBA_EXT_FIX /* VA: SBA external output support fix - do not overwrite "output_config" parameter */		#define NONBE_FIX_1052_SBA_EXT_FIX /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

lib_dec/ivas_binRenderer_internal_fx.c

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1187,9 +1187,7 @@ ivas_error ivas_binRenderer_open_fx(
	BINAURAL_RENDERER_HANDLE hBinRenderer;		BINAURAL_RENDERER_HANDLE hBinRenderer;
	Word16 convBand, k;		Word16 convBand, k;
	ivas_error error;		ivas_error error;
	#ifdef FIX_587_DEFAULT_REVERB
	const IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics;		const IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics;
	#endif

	error = IVAS_ERR_OK;		error = IVAS_ERR_OK;
	move32();		move32();
	@@ -1349,7 +1347,6 @@ ivas_error ivas_binRenderer_open_fx(
	test();		test();
	IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) \|\| ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) )		IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) \|\| ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) )
	{		{
	#ifdef FIX_587_DEFAULT_REVERB
	pRoomAcoustics = NULL;		pRoomAcoustics = NULL;
	IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )		IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
	{		{
	@@ -1359,9 +1356,6 @@ ivas_error ivas_binRenderer_open_fx(
	IF( NE_32( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, pRoomAcoustics, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx, NULL ) ), IVAS_ERR_OK ) )		IF( NE_32( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, pRoomAcoustics, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx, NULL ) ), IVAS_ERR_OK ) )
	#else		#else
	IF( NE_32( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, pRoomAcoustics, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) )		IF( NE_32( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, pRoomAcoustics, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) )
	#endif
	#else
	IF( NE_32( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) )
	#endif		#endif
	{		{
	return error;		return error;