Merge branch '20260115_cleanup' into 'main' (6608faf8) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+16 −71

Original line number	Diff line number	Diff line
		@@ -159,11 +159,6 @@ 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;
		@@ -243,10 +238,6 @@ 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;

		/------------------------------------------------------------------------------------------
		@@ -859,13 +850,6 @@ cleanup:
		#ifdef DEBUG_SBA_AUDIO_DUMP
		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 );
		@@ -4162,12 +4146,6 @@ 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;
		@@ -4190,22 +4168,14 @@ 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 )
		{
		@@ -4214,11 +4184,7 @@ 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
		}
		}
		}
		@@ -4291,32 +4257,17 @@ 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 )
		{
		@@ -4325,17 +4276,11 @@ 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

+0 −8

Original line number	Diff line number	Diff line
		@@ -1076,11 +1076,7 @@ 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 )
		{
		@@ -2100,10 +2096,6 @@ 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/gs_noisefill.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -589,19 +589,11 @@ void highband_exc_dct_in(

		if ( bfi \|\| core_brate < 6000 \|\| ( core_brate < 8600 && coder_type == UNVOICED ) )
		{
		#ifndef FIX_1478_UNINIT_ON_BFI
		set_f( noisepb, 0.4f, MBANDS_GN );
		#else
		set_f( noisepb, 0.4f, last_bin );
		#endif
		}
		else if ( GSC_IVAS_mode == 3 \|\| ( GSC_IVAS_mode > 0 && GSC_noisy_speech == 1 ) )
		{
		#ifndef FIX_1478_UNINIT_ON_BFI
		set_f( noisepb, 0.4f, MBANDS_GN16k );
		#else
		set_f( noisepb, 0.4f, last_bin );
		#endif
		}
		else
		{
		@@ -615,11 +607,7 @@ void highband_exc_dct_in(

		if ( GSC_IVAS_mode == 0 && GSC_noisy_speech && !bfi && element_mode <= IVAS_SCE )
		{
		#ifndef FIX_1478_UNINIT_ON_BFI
		set_f( noisepb, 0.1f, MBANDS_GN );
		#else
		set_f( noisepb, 0.1f, last_bin );
		#endif
		}

		if ( core_brate < 6000 && coder_type <= UNVOICED )

lib_com/hvq_pvq_bitalloc.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -80,9 +80,7 @@ int16_t hvq_pvq_bitalloc(
		int16_t num_sfm;
		int16_t bit_cost;

		#ifdef FIX_1483_PEAQ_VQ_ENC_MSAN_ERROR
		*n_sel_bands = 0;
		#endif

		if ( bwidth == FB )
		{
		@@ -138,9 +136,6 @@ int16_t hvq_pvq_bitalloc(
		return 0;
		}

		#ifndef FIX_1483_PEAQ_VQ_ENC_MSAN_ERROR
		*n_sel_bands = 0;
		#endif
		env_mean = 0;
		E_max = 0;
		k_max = k_start;

lib_com/ifft_rel.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -130,12 +130,10 @@ void ifft_rel(
		id = 4 * id;
		}
		step = N_MAX_FFT / n2;
		#ifdef FIX_2268_OOB_INDEXING_IN_IFFT
		if ( n8 < 2 )
		{
		continue;
		}
		#endif
		s = sincos_t_ext + step;
		c = s + N_MAX_FFT / 4;
		s3 = sincos_t_ext + 3 * step;