Merge branch... (3a347aa9) · Commits · IVAS Codec Public Collaboration / IVAS Codec

Workspace_msvc/lib_dec.vcxproj

+0 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,6 @@
		<ClCompile Include="..\lib_dec\init_dec.c" />
		<ClCompile Include="..\lib_dec\inov_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_agc_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_binRenderer_internal.c" />
		<ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c" />
		<ClCompile Include="..\lib_dec\ivas_core_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_cpe_dec.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.c" />
		<ClCompile Include="..\lib_rend\ivas_cldfb_ring_buffer.c" />
		<ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec.c" />
		<ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions.c" />

apps/decoder.c

+49 −8

Original line number	Diff line number	Diff line
		@@ -159,10 +159,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;
		IVAS_BIN_RENDERER_TYPE binaural_renderer_sec;
		@@ -242,9 +243,10 @@ int main(
		enable_float_exception_trap( FLE_MASK_DENORM \| FLE_MASK_UNDERFLOW );
		#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;

		/------------------------------------------------------------------------------------------
		@@ -856,11 +858,13 @@ cleanup:
		IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );

		#endif
		#ifndef FIX_2249_MEMORY_LEAK_IN_SBA
		if ( arg.hrtfReaderEnabled )
		{
		destroy_td_hrtf( hHrtfBinary.hHrtfTD );
		destroy_hrtf_statistics( hHrtfBinary.hHrtfStatistics );
		}
		#endif

		IVAS_DEC_Close( &hIvasDec );
		CustomLsReader_close( &hLsCustomReader );
		@@ -4154,11 +4158,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;
		@@ -4180,13 +4185,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 )
		{
		@@ -4195,7 +4210,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
		}
		}
		}
		@@ -4268,17 +4287,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 )
		{
		@@ -4287,10 +4321,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
		@@ -1064,7 +1064,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 )
		{
		@@ -2082,8 +2086,10 @@ cleanup:
		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 );

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -175,6 +175,7 @@
		#define FIX_2268_OOB_INDEXING_IN_IFFT /* VA: Fix for issue 2268, to silence clang18 */
		#define FIX_2271_OOB_INDEXING_IN_PIT_OL2 /* VA: Fix for issue 2271, to silence clang18 */
		#define FIX_2273_OOB_INDEXING_IN_PIT_FR4 /* VA: Fix to silence clang on ptr init */
		#define FIX_2249_MEMORY_LEAK_IN_SBA /* OR : issue 2249 : Memory leak in SBA to BINAURAL_ROOM_REVERB with memory instrumentation */
		#define FIX_1483_PEAQ_VQ_ENC_MSAN_ERROR /* Eri: When no PVQ bands are selected in peaq_vq_enc, the number of bands is not initialized. */
		#define FIX_1480_CLANG18_MSAN_UNINIT_VARIABLE /* Eri: Initializes a variable in HQ decoder. It is not used, but is passed uninitialized to a function which is caught by clang-18 */
		#define FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR /* Dolby: Fix for issue 1449: renderer frame size unclear in ISAR */