harmonize ivas_renderTypeOverride and IVAS_RENDER_TYPE_OVERRIDE (bc67fa5b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

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 API_5MS && 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;
		}
		@@ -273,11 +273,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;
		}

lib_dec/lib_dec.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -2045,10 +2045,10 @@ static ivas_error copyRendererConfigStruct( RENDER_CONFIG_HANDLE hRCin, IVAS_REN
		#ifdef DEBUGGING
		switch ( hRCin->renderer_type_override )
		{
		case RENDER_TYPE_OVERRIDE_CREND:
		case IVAS_RENDER_TYPE_OVERRIDE_CREND:
		hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;
		break;
		case RENDER_TYPE_OVERRIDE_FASTCONV:
		case IVAS_RENDER_TYPE_OVERRIDE_FASTCONV:
		hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;
		break;
		default:
		@@ -2109,10 +2109,10 @@ ivas_error IVAS_DEC_GetRenderConfig(
		#ifdef DEBUGGING
		switch ( hRCin->renderer_type_override )
		{
		case RENDER_TYPE_OVERRIDE_CREND:
		case IVAS_RENDER_TYPE_OVERRIDE_CREND:
		hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;
		break;
		case RENDER_TYPE_OVERRIDE_FASTCONV:
		case IVAS_RENDER_TYPE_OVERRIDE_FASTCONV:
		hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;
		break;
		default:
		@@ -2190,14 +2190,14 @@ ivas_error IVAS_DEC_FeedRenderConfig(

		hRenderConfig = hIvasDec->st_ivas->hRenderConfig;
		#ifdef DEBUGGING
		hRenderConfig->renderer_type_override = RENDER_TYPE_OVERRIDE_NONE;
		hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;
		if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
		{
		hRenderConfig->renderer_type_override = RENDER_TYPE_OVERRIDE_FASTCONV;
		hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;
		}
		if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND )
		{
		hRenderConfig->renderer_type_override = RENDER_TYPE_OVERRIDE_CREND;
		hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;
		}
		#endif
		hRenderConfig->roomAcoustics.override = renderConfig.roomAcoustics.override;

lib_rend/ivas_render_config.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ ivas_error ivas_render_config_init_from_rom(
		return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Unexpected null pointer while attempting to fill renderer configuration from ROM" );
		}
		#ifdef DEBUGGING
		( *hRenderConfig )->renderer_type_override = RENDER_TYPE_OVERRIDE_NONE;
		( *hRenderConfig )->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;
		#endif
		( *hRenderConfig )->roomAcoustics.override = FALSE;
		( *hRenderConfig )->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_N_BANDS;

lib_rend/lib_rend.c

+4 −12

Original line number	Diff line number	Diff line
		@@ -5064,10 +5064,10 @@ int16_t IVAS_REND_GetRenderConfig(
		#ifdef DEBUGGING
		switch ( hRCin->renderer_type_override )
		{
		case RENDER_TYPE_OVERRIDE_CREND:
		case IVAS_RENDER_TYPE_OVERRIDE_CREND:
		hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;
		break;
		case RENDER_TYPE_OVERRIDE_FASTCONV:
		case IVAS_RENDER_TYPE_OVERRIDE_FASTCONV:
		hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;
		break;
		default:
		@@ -5127,15 +5127,7 @@ int16_t IVAS_REND_FeedRenderConfig(
		}
		hRenderConfig = hIvasRend->hRendererConfig;
		#ifdef DEBUGGING
		hRenderConfig->renderer_type_override = RENDER_TYPE_OVERRIDE_NONE;
		if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
		{
		hRenderConfig->renderer_type_override = RENDER_TYPE_OVERRIDE_FASTCONV;
		}
		if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND )
		{
		hRenderConfig->renderer_type_override = RENDER_TYPE_OVERRIDE_CREND;
		}
		hRenderConfig->renderer_type_override = renderConfig.renderer_type_override;
		#endif

		hRenderConfig->roomAcoustics.override = renderConfig.roomAcoustics.override;