Merge branch 'main' into basop-2294-clang-18-encoder-clang18-warnings (1d21a9e8) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/lib_dec.vcxproj

+0 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,6 @@
		<ClCompile Include="..\lib_dec\init_dec_fx.c" />
		<ClCompile Include="..\lib_dec\inov_dec_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_agc_dec_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_binRenderer_internal_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_core_dec_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_cpe_dec_fx.c" />

Workspace_msvc/lib_isar.vcxproj

+0 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,6 @@
		<ClCompile Include="..\lib_isar\isar_lc3plus_enc.c" />
		<ClCompile Include="..\lib_isar\isar_lc3plus_payload.c" />
		<ClCompile Include="..\lib_isar\isar_MSPred.c" />
		<ClCompile Include="..\lib_isar\isar_NoiseGen.c" />
		<ClCompile Include="..\lib_isar\isar_PerceptualModel.c" />
		<ClCompile Include="..\lib_isar\isar_PredDecoder.c" />
		<ClCompile Include="..\lib_isar\isar_PredEncoder.c" />

Workspace_msvc/lib_rend.vcxproj

+1 −0

Original line number	Diff line number	Diff line
		@@ -138,6 +138,7 @@
		</Lib>
		</ItemDefinitionGroup>
		<ItemGroup>
		<ClCompile Include="..\lib_rend\ivas_binRenderer_internal_fx.c" />
		<ClCompile Include="..\lib_rend\ivas_cldfb_ring_buffer.c" />
		<ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec_fx.c" />
		<ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions_fx.c" />

apps/decoder.c

+56 −7

Original line number	Diff line number	Diff line
		@@ -142,9 +142,11 @@ typedef struct
		hrtfFileReader *hrtfReader;
		char *hrtfFileName;

		#ifndef FIX_2249_MEMORY_LEAK_IN_SBA
		IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD;

		IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics;
		#endif

		IVAS_BIN_RENDERER_TYPE binaural_renderer;
		IVAS_BIN_RENDERER_TYPE binaural_renderer_old;
		@@ -207,8 +209,10 @@ int main(
		reset_mem( USE_BYTES );
		#endif

		#ifndef FIX_2249_MEMORY_LEAK_IN_SBA
		hHrtfBinary.hHrtfTD = NULL; /* just to avoid compilation warning */
		hHrtfBinary.hHrtfStatistics = NULL; /* just to avoid compilation warning */
		#endif

		splitRendBits.bits_buf = splitRendBitsBuf;

		@@ -452,6 +456,13 @@ int main(
		fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#ifdef FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR
		if ( !arg.renderConfigEnabled && ( arg.renderFramesize != asked_frame_size ) )
		{
		fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );
		}
		#endif
		}

		/------------------------------------------------------------------------------------------
		@@ -730,6 +741,7 @@ cleanup:
		free( arg.aeSequence.pValidity );
		}

		#ifndef FIX_2249_MEMORY_LEAK_IN_SBA
		if ( arg.hrtfReaderEnabled )
		{
		destroy_td_hrtf( hHrtfBinary.hHrtfTD );
		@@ -742,6 +754,7 @@ cleanup:
		IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;
		IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics );
		destroy_hrtf_statistics( hHrtfStatistics );
		#endif
		#endif
		IVAS_DEC_Close( &hIvasDec );
		CustomLsReader_close( &hLsCustomReader );
		@@ -3756,12 +3769,12 @@ static ivas_error load_hrtf_from_file(
		/------------------------------------------------------------------------------------------
		* Release HRTF binary data
		------------------------------------------------------------------------------------------/

		#ifndef FIX_2249_MEMORY_LEAK_IN_SBA
		if ( !( binaural_renderer == IVAS_BIN_RENDERER_TYPE_TDREND \|\| binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT ) && binaural_renderer_sec != IVAS_BIN_RENDERER_TYPE_TDREND && hHrtfBinary->hHrtfTD != NULL )
		{
		destroy_td_hrtf( hHrtfBinary->hHrtfTD );
		}

		#endif
		if ( ( error = IVAS_DEC_HRTF_binary_close( hIvasDec, hHrtfBinary->binaural_renderer_old ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -3783,13 +3796,23 @@ static ivas_error load_hrtf_from_file(

		if ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_TDREND \|\| binaural_renderer_sec == IVAS_BIN_RENDERER_TYPE_TDREND \|\| binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT )
		{

		#ifdef FIX_2249_MEMORY_LEAK_IN_SBA
		IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD = NULL;
		if ( ( error = IVAS_DEC_GetHrtfTDrendHandle( hIvasDec, &hHrtfTD ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_GetHrtfTDrendHandle( hIvasDec, &hHrtfBinary->hHrtfTD ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfTDrendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		return error;
		}

		#ifdef FIX_2249_MEMORY_LEAK_IN_SBA
		if ( ( error = load_TDrend_HRTF_binary( *hHrtfTD, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = load_TDrend_HRTF_binary( *hHrtfBinary->hHrtfTD, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		@@ -3798,7 +3821,11 @@ static ivas_error load_hrtf_from_file(
		}
		else
		{
		#ifdef FIX_2249_MEMORY_LEAK_IN_SBA
		destroy_td_hrtf( hHrtfTD );
		#else
		destroy_td_hrtf( hHrtfBinary->hHrtfTD );
		#endif
		}
		}
		}
		@@ -3871,17 +3898,32 @@ static ivas_error load_hrtf_from_file(
		}
		}
		}
		#ifndef FIX_2249_MEMORY_LEAK_IN_SBA
		}
		#endif

		#ifdef FIX_2249_MEMORY_LEAK_IN_SBA
		if ( ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV \|\| binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		#else
		if ( hHrtfBinary->hHrtfStatistics == NULL && ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV \|\| binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		#endif
		{
		#ifdef FIX_2249_MEMORY_LEAK_IN_SBA
		IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;
		if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfBinary->hHrtfStatistics ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfStatisticsHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		return error;
		}

		#ifdef FIX_2249_MEMORY_LEAK_IN_SBA
		if ( ( error = load_HrtfStatistics_from_binary( *hHrtfStatistics, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = load_reverb_binary( *hHrtfBinary->hHrtfStatistics, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		@@ -3890,10 +3932,17 @@ static ivas_error load_hrtf_from_file(
		}
		else
		{
		#ifdef FIX_2249_MEMORY_LEAK_IN_SBA
		destroy_hrtf_statistics( hHrtfStatistics );
		#else
		destroy_hrtf_statistics( hHrtfBinary->hHrtfStatistics );
		#endif
		}
		}
		}
		#ifdef FIX_2249_MEMORY_LEAK_IN_SBA
		}
		#endif

		return IVAS_ERR_OK;
		}

apps/renderer.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1102,7 +1102,11 @@ int main(
		fprintf( stderr, "\nIVAS_REND_GetHrtfStatisticsHandle failed\n\n" );
		goto cleanup;
		}
		#ifdef FIX_2249_MEMORY_LEAK_IN_SBA
		if ( ( error = load_HrtfStatistics_from_binary( *hHrtfStatistics, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = load_reverb_binary( *hHrtfStatistics, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		@@ -2192,8 +2196,10 @@ cleanup:
		RotationFileReader_close( &externalOrientationFileReader );
		RotationFileReader_close( &referenceRotReader );
		Vector3PairFileReader_close( &referenceVectorReader );
		#ifndef FIX_2249_MEMORY_LEAK_IN_SBA
		destroy_td_hrtf( hHrtfTD );
		destroy_hrtf_statistics( hHrtfStatistics );
		#endif
		IVAS_REND_Close( &hIvasRend );
		IsmPositionProvider_close( positionProvider );
		RenderConfigReader_close( &renderConfigReader );