Merge branch '744-fix-sofa-to-rom-tables-and-binaural-binary-files' of... (19d2f3b3) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_rend/ivas_rom_binauralRenderer.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -46955,8 +46955,8 @@ const float fastconvReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX] =


		/*
		/* Binaural rendering data set based on BRIRs */
		/* Tables derived from Mozart IIS BRIRs.*/
		Binaural rendering data set based on BRIRs
		Tables derived from Mozart IIS BRIRs.*/


		const float hrtfShCoeffsRe[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]=
		@@ -47519,4 +47519,3 @@ const float parametricEarlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX] = {
		#undef WMC_TOOL_SKIP

		/* clang-format on */

+1 −3

Original line number	Diff line number	Diff line
		@@ -3641,7 +3641,7 @@ static void freeDecoderDummy(

		/* Parametric binaural renderer HRTF structure */
		#ifdef FIX_BINARY_BINAURAL_READING
		if ( pDecDummy->hHrtfParambin != NULL && pDecDummy->hHrtfParambin->allocatedFromFile == 0 )
		if ( ( pDecDummy->hHrtfParambin != NULL ) && ( pDecDummy->hHrtfParambin->allocatedFromFile == 0 ) )
		#else
		if ( pDecDummy->hHrtfParambin != NULL )
		#endif
		@@ -9334,8 +9334,6 @@ void IVAS_REND_Close(
		ivas_binaural_hrtf_close( &hIvasRend->hHrtfFastConv );

		/* Parametric binauralizer HRTF filters */


		ivas_HRTF_binary_close( &( hIvasRend->hHrtfTD ) );
		ivas_HRTF_CRend_binary_close( &( hIvasRend->hSetOfHRTF ) );
		ivas_HRTF_fastconv_binary_close( &( hIvasRend->hHrtfFastConv ) );

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ def load(
		np.ndarray,
		np.ndarray,
		]:
		hrtf = Dataset(filename, "r", format="NETCDF4")
		hrtf = Dataset(filename, "r")
		Database_Name = hrtf.DatabaseName
		Listener_Short_Name = hrtf.ListenerShortName
		latencys = 0

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		% the United Nations Convention on Contracts on the International Sales of Goods.
		%
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
		clear -regexp ^((?!writeRomFileOutput\|writeBinaryOutput\|writeEachRendererBinaryOutput\|rom_file\|bin_file\|hrir_file\|brir_file\|ivas_path\|binary_path\|output_bin_name\|param_bin_file\|fastconv_bin_file\|td_binary_file\|binary_name).)*$
		clear -regexp ^((?!writeRomFileOutput\|writeBinaryOutput\|writeEachRendererBinaryOutput\|rom_file\|bin_file\|hrir_file\|brir_file\|ivas_path\|binary_path\|output_bin_name\|param_bin_file\|fastconv_bin_file\|td_binary_file\|binary_name\|rom_path).)*$
		close all;
		clc;

+6 −2

Original line number	Diff line number	Diff line
		@@ -981,6 +981,8 @@ int main( int argc, char *argv[] )
		convert_backslash( argv[i] );

		err = generate_crend_ivas_tables_from_sofa( argv[i], &cfgBrirOptim );
		if ( err != 0 )
		return err;

		if ( ( h_file_path != NULL ) && ( c_file_path != NULL ) )
		{
		@@ -1020,7 +1022,9 @@ int main( int argc, char *argv[] )
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( sofa_file_path_for_reverb != NULL )
		{
		generate_reverb_ivas_tables_from_sofa( sofa_file_path_for_reverb );
		err = generate_reverb_ivas_tables_from_sofa( sofa_file_path_for_reverb );
		if ( err != 0 )
		return err;
		}
		#endif
		if ( ( h_file_path != NULL ) && ( c_file_path != NULL ) )
		@@ -1204,7 +1208,7 @@ int generate_crend_ivas_tables_from_sofa( const char file_path, ConfigReader c
		usage_gen_crend_tables();
		free( sofa_file_path );

		return err;
		return -1;
		}
		hrtf->lookup = NULL;
		hrtf->neighborhood = NULL;