gen rom on windows with matlab 2017 (5cdd5732) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_rend/ivas_rom_TdBinauralRenderer.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		the United Nations Convention on Contracts on the International Sales of Goods.

		*******************************************************************************************************/
		/* Generated on 17-May-2024 with Matlab version 9.3.0.713579 (R2017b) by marcemerit on PCWIN64 */
		/* Generated on 27-May-2024 with Matlab version 9.3.0.713579 (R2017b) by marcemerit on PCWIN64 */



		@@ -10164,16 +10164,16 @@ const int16_t defaultHRIR_rom_ITD_model_configuration[4] = {
		3, /* elevSegSamples */
		10, /* azimSegSamples */
		};
		const int16_t defaultHRIR_rom_ITD_elevBsLen[4] = {
		int16_t defaultHRIR_rom_ITD_elevBsLen[4] = {
		4, 7, 10, 7,
		};
		const int16_t defaultHRIR_rom_ITD_elevBsStart[4] = {
		int16_t defaultHRIR_rom_ITD_elevBsStart[4] = {
		0, 4, 11, 21,
		};
		const int16_t defaultHRIR_rom_ITD_azimBsLen[4] = {
		int16_t defaultHRIR_rom_ITD_azimBsLen[4] = {
		11, 21, 31, 21,
		};
		const int16_t defaultHRIR_rom_ITD_azimBsStart[4] = {
		int16_t defaultHRIR_rom_ITD_azimBsStart[4] = {
		0, 11, 32, 63,
		};
		#endif

lib_rend/ivas_rom_TdBinauralRenderer.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -83,9 +83,9 @@ extern const uint32_t defaultHRIR_rom_ITD_elevBsShape[28];
		extern const float defaultHRIR_rom_ITD_elevKSeq[16];
		#ifdef FIX_989_TD_REND_ROM
		extern const int16_t defaultHRIR_rom_ITD_model_configuration[4];
		extern const int16_t defaultHRIR_rom_ITD_elevBsLen[4];
		extern const int16_t defaultHRIR_rom_ITD_elevBsStart[4];
		extern const int16_t defaultHRIR_rom_ITD_azimBsLen[4];
		extern const int16_t defaultHRIR_rom_ITD_azimBsStart[4];
		extern int16_t defaultHRIR_rom_ITD_elevBsLen[4];
		extern int16_t defaultHRIR_rom_ITD_elevBsStart[4];
		extern int16_t defaultHRIR_rom_ITD_azimBsLen[4];
		extern int16_t defaultHRIR_rom_ITD_azimBsStart[4];
		#endif
		#endif

lib_rend/ivas_rom_binauralRenderer.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@
		/* Tables generated by the script at "scripts/binauralRenderer_interface/fastconv/generate_tables_for_fastconv.m */
		/* Can be replaced by your own generated HRIR tables */
		/*
		* Generated on 17-May-2024 with Matlab version 9.3.0.713579 (R2017b) by marcemerit on PCWIN64
		* Generated on 27-May-2024 with Matlab version 9.3.0.713579 (R2017b) by marcemerit on PCWIN64
		*/


		@@ -46955,7 +46955,7 @@ const uint32_t fastconvReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX] =


		/*
		* Generated on 17-May-2024 with Matlab version 9.3.0.713579 (R2017b) by marcemerit on PCWIN64
		* Generated on 27-May-2024 with Matlab version 9.3.0.713579 (R2017b) by marcemerit on PCWIN64
		* Binaural rendering data set based on BRIRs
		Tables derived from Mozart IIS BRIRs.*/

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -1357,13 +1357,14 @@ char create_hrtf_parametric( int32_t hrtf_size )
		{
		char hrtf = NULL, hrtf_wptr, *full_in_param_bin_path = NULL;
		uint32_t hrtf_data_size;
		uint32_t data_size_tmp;

		#ifndef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT
		int16_t i, j;
		uint32_t data_size_tmp;
		#endif
		FILE *input_param_bin_file = NULL;

		#ifdef FLOAT_FIX_POINT_HRTF_FILE_FORMAT
		char hrtf_identifier[8] = "";
		int16_t is_fx = 0;
		if ( strstr( input_param_bin_file_name, "_fx" ) )
		{
		@@ -1401,8 +1402,6 @@ char create_hrtf_parametric( int32_t hrtf_size )

		if ( input_param_bin_file != NULL )
		{
		uint16_t hrtf_sh_channels, hrtf_num_bins, cldfb_no_channels_max;

		fseek( input_param_bin_file, 0, SEEK_END );
		hrtf_data_size = ftell( input_param_bin_file );
		fseek( input_param_bin_file, 0, SEEK_SET );

scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c

+2 −17

Original line number	Diff line number	Diff line
		@@ -2831,14 +2831,11 @@ uint32_t compute_binary_size_fx( HRTFS_DATA *hrtf, crend_hrtf_tables_dimensions
		---------------------------------------------------------------------/
		ivas_error make_fx_be( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int32_t samplerate, const int16_t frame_len, int16_t factorQ[3] )
		{
		FILE *output_binary_file;

		int16_t iIR, iIter, iChan, iTap;
		uint32_t data_size_tmp;
		float *coeff_rptr;
		float maxVal;
		char tmpStr[64];
		float maxDiff = 0, diff, tmp, tmp2;
		float maxDiff = 0, diff, tmp;
		Word16 tmp16;
		Word32 tmp32;

		@@ -3107,9 +3104,6 @@ ivas_error write_binary_file_fx( HRTFS_DATA *hrtf, struct ivas_layout_config lsc
		int16_t iIR, iIter, iChan, iTap;
		uint32_t data_size_tmp;
		float *coeff_rptr;
		float maxVal;

		char tmpStr[64];
		float maxDiff = 0, diff, tmp, tmp2;

		crend_hrtf_tables_dimensions hrtf_table_dims;
		@@ -3401,8 +3395,6 @@ ivas_error write_binary_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg,
		int16_t iIR, iIter, iChan, iTap;
		uint32_t data_size_tmp;
		float *coeff_rptr;
		char tmpStr[64];

		crend_hrtf_tables_dimensions hrtf_table_dims;

		uint32_t hrtf_data_size;
		@@ -3684,15 +3676,9 @@ ivas_error write_binary_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg,
		---------------------------------------------------------------------/
		ivas_error make_reverb_fx_be( float pEner_l, float pEner_r, float pCoherence, const int32_t samplerate, Word16 factorQ )
		{
		FILE *output_binary_file;
		uint32_t hrtf_data_size;


		int16_t iTap;
		float *coeff_rptr;
		float maxVal;
		char tmpStr[64];
		float maxDiff = 0, diff, tmp, tmp2;
		float maxDiff = 0, diff, tmp;
		Word16 tmp16;

		int16_t len = LR_IAC_LENGTH_NR_FC;
		@@ -3781,7 +3767,6 @@ ivas_error write_reverb_to_binary_file_fx( float pEner_l, float pEner_r, float
		FILE *output_binary_file;

		int16_t iTap;
		char tmpStr[64];
		uint32_t hrtf_data_size;
		float maxDiff = 0, diff, tmp, tmp2;