Removal of use_brir and late_reverb_on flags from renderer configuration (4156a098) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -758,9 +758,7 @@ int main(
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		renderConfig.room_acoustics.late_reverb_on = TRUE;
		renderConfig.room_acoustics.override = TRUE;
		renderConfig.room_acoustics.use_brir = FALSE;
		}
		#endif

lib_com/common_api_types.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -135,8 +135,10 @@ typedef struct
		typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG
		{
		int16_t override;
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		int16_t use_brir;
		int16_t late_reverb_on;
		#endif
		int16_t 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_dec/ivas_binRenderer_internal.c

+18 −0

Original line number	Diff line number	Diff line
		@@ -133,7 +133,9 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		const int16_t renderer_type,
		const int16_t isLoudspeaker,
		const AUDIO_CONFIG input_config,
		#ifndef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		const RENDER_CONFIG_DATA *hRenderConfig,
		#endif
		const HRTFS_FASTCONV_HANDLE hHrtf )
		{
		int16_t bandIdx, chIdx;
		@@ -162,7 +164,11 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		hBinRenderer->nInChannels = ( audioCfg2channels( input_config ) - isLoudspeaker );
		}

		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )
		#else
		if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && hRenderConfig->roomAcoustics.use_brir )
		#endif
		{
		hBinRenConvModule->numTaps = BINAURAL_NTAPS_MAX;

		@@ -322,7 +328,11 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		#endif
		}

		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )
		#else
		if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && hRenderConfig->roomAcoustics.use_brir )
		#endif
		{
		/* set the memories to zero */
		set_zero( hBinRenConvModule->filterStatesLeftReal[bandIdx][chIdx], hBinRenConvModule->numTapsArray[bandIdx] );
		@@ -701,7 +711,9 @@ ivas_error ivas_binRenderer_open(
		st_ivas->renderer_type,
		1,
		AUDIO_CONFIG_7_1_4,
		#ifndef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		st_ivas->hRenderConfig,
		#endif
		st_ivas->hHrtfFastConv ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -727,7 +739,9 @@ ivas_error ivas_binRenderer_open(
		st_ivas->renderer_type,
		st_ivas->hIntSetup.is_loudspeaker_setup,
		st_ivas->hIntSetup.output_config,
		#ifndef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		st_ivas->hRenderConfig,
		#endif
		st_ivas->hHrtfFastConv ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -771,7 +785,11 @@ ivas_error ivas_binRenderer_open(
		}

		/* Allocate memories needed for reverb module */
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		#else
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )
		#endif
		{
		if ( ( error = ivas_binaural_reverb_open( &( hBinRenderer->hReverb ),
		hBinRenderer->conv_band,

lib_dec/ivas_init_dec.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -674,9 +674,7 @@ ivas_error ivas_init_decoder_front(
		}

		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( ( error = ivas_render_config_init_from_rom( &st_ivas->hRenderConfig,
		st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR,
		st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_render_config_init_from_rom( &st_ivas->hRenderConfig ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_render_config_init_from_rom( &st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM ) ) != IVAS_ERR_OK )
		#endif
		@@ -1367,7 +1365,11 @@ ivas_error ivas_init_decoder(
		return error;
		}

		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		#else
		if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )
		#endif
		{
		if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
		{

lib_dec/ivas_mct_dec.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -1164,8 +1164,11 @@ static ivas_error ivas_mc_dec_reconfig(
		{
		ivas_binRenderer_close( &st_ivas->hBinRenderer );
		}

		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hCrend != NULL ) && ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD \|\| st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) )
		#else
		if ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hCrend != NULL ) && ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD \|\| st_ivas->hRenderConfig->roomAcoustics.late_reverb_on == 0 ) ) )
		#endif
		{
		ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );
		}
		@@ -1223,7 +1226,11 @@ static ivas_error ivas_mc_dec_reconfig(
		return error;
		}

		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		#else
		if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )
		#endif
		{
		if ( ( error = ivas_rend_initCrendWrapper( &st_ivas->hCrendWrapper ) ) != IVAS_ERR_OK )
		{