Port float MR 1765 to BASOP. (07167a95) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -561,7 +561,9 @@ int main(
		#endif
		goto cleanup;
		}
		#ifndef FIX_587_DEFAULT_REVERB
		renderConfig.roomAcoustics.override = true;
		#endif
		}
		/* ISAR frame size is set from command line, not renderer config file.
		* This will be ignored if output format is not split rendering. */

apps/renderer.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1191,7 +1191,9 @@ int main(
		#endif
		goto cleanup;
		}
		#ifndef FIX_587_DEFAULT_REVERB
		renderConfig.roomAcoustics.override = 1;
		#endif
		}

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

lib_com/common_api_types.h

+2 −0

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

		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] */
		float pFc_input[IVAS_CLDFB_NO_CHANNELS_MAX]; /* Center frequencies for which following values are provided: */
		float pAcoustic_rt60[IVAS_CLDFB_NO_CHANNELS_MAX]; /* - The room's T60 per center frequency */

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,7 @@
		#define FIX_1138_SBA_EXT_ERROR_PRINTOUT /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */
		#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */
		#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */
		#define FIX_587_DEFAULT_REVERB /* Philips: issue 587: inconsistent default reverb parameters across renderers */

		/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_binRenderer_internal_fx.c

+52 −38

Original line number	Diff line number	Diff line
		@@ -1274,6 +1274,9 @@ ivas_error ivas_binRenderer_open_fx(
		Word16 convBand, chIdx, k;
		#endif
		ivas_error error;
		#ifdef FIX_587_DEFAULT_REVERB
		const IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics;
		#endif

		error = IVAS_ERR_OK;
		move32();
		@@ -1437,7 +1440,18 @@ ivas_error ivas_binRenderer_open_fx(
		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 ) )
		#endif
		{
		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 ) ){
		#ifdef FIX_587_DEFAULT_REVERB
		pRoomAcoustics = NULL;
		IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		{
		pRoomAcoustics = &( st_ivas->hRenderConfig->roomAcoustics );
		}

		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 ) )
		#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
		{
		return error;
		}