Merge branch '743-render_config_handle-defined-twice' into 'main' (aaa35bcb) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -690,7 +690,7 @@ int main(

		if ( arg.outputConfig == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.acousticEnvironmentId, &renderConfig.room_acoustics ) ) == IVAS_ERR_OK )
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.acousticEnvironmentId, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		{
		if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
		{
		@@ -707,7 +707,7 @@ int main(
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", arg.acousticEnvironmentId );
		goto cleanup;
		}
		renderConfig.room_acoustics.override = true;
		renderConfig.roomAcoustics.override = true;
		}

		if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )
		@@ -716,6 +716,7 @@ int main(
		goto cleanup;
		}
		}

		/------------------------------------------------------------------------------------------
		* Load custom loudspeaker layout data
		------------------------------------------------------------------------------------------/

apps/renderer.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1067,7 +1067,7 @@ int main(

		if ( args.outConfig.audioConfig == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, args.acousticEnvironmentId, &renderConfig.room_acoustics ) ) == IVAS_ERR_OK )
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, args.acousticEnvironmentId, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		{
		if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
		{
		@@ -1080,7 +1080,7 @@ int main(
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", args.acousticEnvironmentId );
		exit( -1 );
		}
		renderConfig.room_acoustics.override = 1;
		renderConfig.roomAcoustics.override = 1;
		}

		if ( ( error = IVAS_REND_FeedRenderConfig( hIvasRend, renderConfig ) ) != IVAS_ERR_OK )

lib_com/common_api_types.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -273,7 +273,7 @@ typedef struct _IVAS_RENDER_CONFIG
		#ifdef DEBUGGING
		IVAS_RENDER_TYPE_OVERRIDE renderer_type_override;
		#endif
		IVAS_ROOM_ACOUSTICS_CONFIG_DATA room_acoustics;
		IVAS_ROOM_ACOUSTICS_CONFIG_DATA roomAcoustics;
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		IVAS_SPLIT_REND_CONFIG_DATA split_rend_config;
		#endif

lib_com/ivas_cnst.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -121,15 +121,6 @@ typedef enum
		RENDERER_OSBA_LS
		} RENDERER_TYPE;

		#ifdef DEBUGGING
		typedef enum
		{
		RENDER_TYPE_OVERRIDE_NONE,
		RENDER_TYPE_OVERRIDE_CREND,
		RENDER_TYPE_OVERRIDE_FASTCONV
		} ivas_renderTypeOverride;
		#endif

		#if defined SPLIT_REND_WITH_HEAD_ROT
		typedef enum
		{

lib_dec/ivas_output_config.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ void ivas_renderer_select(
		{
		*renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM;
		#ifdef DEBUGGING
		if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV )
		if ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
		{
		*renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;
		}
		@@ -242,11 +242,11 @@ void ivas_renderer_select(
		}

		#if 0 // def DEBUGGING /temp disabling this as paramMC crashes with CREND/
		if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_CREND )
		if ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND )
		{
		*renderer_type = RENDERER_BINAURAL_MIXER_CONV;
		}
		else if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV )
		else if ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
		{
		*renderer_type = RENDERER_BINAURAL_FASTCONV;
		}
		@@ -275,11 +275,11 @@ void ivas_renderer_select(
		*renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;
		}
		#ifdef DEBUGGING
		if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_CREND )
		if ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND )
		{
		*renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM;
		}
		else if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV )
		else if ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
		{
		*renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;
		}