remove debugging parameter 'renderer_type_override' (1574e699) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -3909,13 +3909,7 @@ static ivas_error decodeVoIP(
		numPiData++;
		}

		if ( ( error = IVAS_DEC_FeedPiDataToDecoder( hIvasDec, &ivasRtp.piData[ivasRtp.nProcPiData], numPiData
		#ifdef DEBUGGING
		,
		renderConfig
		#endif

		) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_FeedPiDataToDecoder( hIvasDec, &ivasRtp.piData[ivasRtp.nProcPiData], numPiData ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;

lib_com/common_api_types.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -346,9 +346,6 @@ typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG

		typedef struct _IVAS_RENDER_CONFIG
		{
		#ifdef DEBUGGING
		IVAS_RENDER_TYPE_OVERRIDE renderer_type_override;
		#endif
		IVAS_ROOM_ACOUSTICS_CONFIG_DATA roomAcoustics;
		ISAR_SPLIT_REND_CONFIG_DATA split_rend_config;
		float directivity[IVAS_MAX_NUM_OBJECTS * 3];

lib_dec/ivas_output_config.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -137,12 +137,6 @@ void ivas_renderer_select(
		else
		{
		*renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM;
		#ifdef DEBUGGING
		if ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
		{
		*renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;
		}
		#endif
		*internal_config = IVAS_AUDIO_CONFIG_7_1_4;
		}
		}
		@@ -265,16 +259,6 @@ void ivas_renderer_select(
		{
		*renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;
		}
		#ifdef DEBUGGING
		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 == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
		{
		*renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;
		}
		#endif
		}
		}
		}

lib_dec/lib_dec.c

+1 −50

Original line number	Diff line number	Diff line
		@@ -3514,20 +3514,6 @@ static ivas_error copyRendererConfigStruct(
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		#ifdef DEBUGGING
		switch ( hRCin->renderer_type_override )
		{
		case IVAS_RENDER_TYPE_OVERRIDE_CREND:
		hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;
		break;
		case IVAS_RENDER_TYPE_OVERRIDE_FASTCONV:
		hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;
		break;
		default:
		hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;
		break;
		}
		#endif
		#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT
		hRCout->roomAcoustics.aeID = hRCin->roomAcoustics.aeID;
		#endif
		@@ -3617,17 +3603,6 @@ ivas_error IVAS_DEC_FeedRenderConfig(
		hRenderConfig = hIvasDec->st_ivas->hRenderConfig;
		st_ivas = hIvasDec->st_ivas;

		#ifdef DEBUGGING
		hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;
		if ( renderConfig.renderer_type_override == IVAS_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 = IVAS_RENDER_TYPE_OVERRIDE_CREND;
		}
		#endif
		#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT
		hRenderConfig->roomAcoustics.aeID = renderConfig.roomAcoustics.aeID;
		#endif
		@@ -3727,10 +3702,6 @@ ivas_error IVAS_DEC_FeedRenderConfig(
		static ivas_error feedAcousticEnvPI(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		const IVAS_PIDATA_ACOUSTIC_ENV hAcoustEnvPI /* i : Render configuration struct */
		#ifdef DEBUGGING
		,
		const IVAS_RENDER_CONFIG_DATA renderConfig / i : Render configuration struct */
		#endif
		)
		{
		RENDER_CONFIG_HANDLE hRenderConfig;
		@@ -3745,17 +3716,6 @@ static ivas_error feedAcousticEnvPI(
		hRenderConfig = hIvasDec->st_ivas->hRenderConfig;
		st_ivas = hIvasDec->st_ivas;

		#ifdef DEBUGGING
		hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;
		if ( renderConfig->renderer_type_override == IVAS_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 = IVAS_RENDER_TYPE_OVERRIDE_CREND;
		}
		#endif
		/* Ignore if AE ID already in use */
		if ( hRenderConfig->roomAcoustics.aeID == hAcoustEnvPI.aeid )
		{
		@@ -6155,10 +6115,6 @@ ivas_error IVAS_DEC_FeedPiDataToDecoder(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		hPiDataTs piData, /* i : PI data received in rtp packet */
		uint32_t numPiData /* i : number of PI data received in rtp packet */
		#ifdef DEBUGGING
		,
		const IVAS_RENDER_CONFIG_DATA renderConfig / i : Render configuration struct */
		#endif
		)
		{
		uint32_t i;
		@@ -6208,12 +6164,7 @@ ivas_error IVAS_DEC_FeedPiDataToDecoder(

		if ( piData->data.acousticEnv.availLateReverb && st_ivas->hRenderConfig != NULL && aeid != st_ivas->hRenderConfig->roomAcoustics.aeID )
		{
		error = feedAcousticEnvPI( hIvasDec, piData->data.acousticEnv
		#ifdef DEBUGGING
		,
		renderConfig
		#endif
		);
		error = feedAcousticEnvPI( hIvasDec, piData->data.acousticEnv );
		}
		}
		break;

lib_dec/lib_dec.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -553,9 +553,6 @@ ivas_error IVAS_DEC_FeedPiDataToDecoder(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		hPiDataTs piData, /* i : PI data received in rtp packet */
		uint32_t numPiData /* i : number of PI data received in rtp packet */
		#ifdef DEBUGGING
		,const IVAS_RENDER_CONFIG_DATA renderConfig / i : Render configuration struct */
		#endif
		);
		#endif