changes in renderer.c (36dfe993) · Commits · SA4 / Audio / IVAS BASOP

apps/renderer.c

+30 −0

Original line number	Diff line number	Diff line
		@@ -676,6 +676,9 @@ int main(
		IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
		IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;
		IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;
		#endif
		IsmPositionProvider *positionProvider;
		LfeRoutingConfig *lfeRoutingConfigs[RENDERER_MAX_MC_INPUTS];
		RenderConfigReader *renderConfigReader = NULL;
		@@ -961,6 +964,7 @@ int main(
		}
		}

		#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )
		{
		@@ -970,6 +974,7 @@ int main(
		goto cleanup;
		}
		}
		#endif
		#endif

		if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		@@ -1051,6 +1056,28 @@ int main(
		destroy_parambin_hrtf( hHrtfParambin );
		}
		}

		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( error = IVAS_REND_GetHrtfStatisticsHandle( hIvasRend, &hHrtfStatistics ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_GetHrtfStatisticsHandle failed\n\n" );
		goto cleanup;
		}
		if ( ( error = load_reverb_binary( *hHrtfStatistics, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );
		goto cleanup;
		}
		else
		{
		destroy_hrtf_statistics( hHrtfStatistics );
		}
		}
		#endif
		#endif
		}

		hrtfFileReader_close( &hrtfFileReader );
		@@ -2139,6 +2166,9 @@ cleanup:
		{
		destroy_td_hrtf( hHrtfTD );
		}
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		destroy_hrtf_statistics( hHrtfStatistics );
		#endif
		IVAS_REND_Close( &hIvasRend );
		IsmPositionProvider_close( positionProvider );
		RenderConfigReader_close( &renderConfigReader );