fix bug for BRIR (3ce80666) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_rend/ivas_rom_binaural_crend_head.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1596,7 +1596,7 @@ const float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,
		/******************** CRendBin_Combined_BRIR ********************/

		#ifdef FIX_BINAURAL_DELAY_PRECISION
		const float CRendBin_Combined_BRIR_latency_s = 0.000145833f;
		const float CRendBin_Combined_BRIR_latency_s = 0.000145834f;
		#else
		const float CRendBin_Combined_BRIR_latency_s = 0.000145833328133f;
		#endif

lib_rend/ivas_rom_binaural_crend_head.h

+0 −43

Original line number	Diff line number	Diff line
		/******************************************************************************************************

		(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
		contributors to this repository. All Rights Reserved.

		This software is protected by copyright law and by international treaties.
		The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
		contributors to this repository retain full ownership rights in their respective contributions in
		the software. This notice grants no license of any kind, including but not limited to patent
		license, nor is any license granted by implication, estoppel or otherwise.

		Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
		contributions.

		This software is provided "AS IS", without any express or implied warranties. The software is in the
		development stage. It is intended exclusively for experts who have experience with such software and
		solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
		and fitness for a particular purpose are hereby disclaimed and excluded.

		Any dispute, controversy or claim arising under or in relation to providing this software shall be
		submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
		accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
		the United Nations Convention on Contracts on the International Sales of Goods.

		*******************************************************************************************************/

		/* clang-format off */

		/*-------------------------------------------------------------------------
		* Binaural rendering related ROM tables
		------------------------------------------------------------------------/

		/* Binaural rendering data set based on HRIRs */
		/* Tables generated by the exe at "scripts/binauralRenderer_interface/generate_cren_ivas_tables. */
		/* Can be replaced by your own generated HRIR or BRIRI tables */



		#ifndef _IVAS_ROM_BINAURAL_CREND_HEAD_
		#define _IVAS_ROM_BINAURAL_CREND_HEAD_

scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c

+33 −37

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@
		#define FORMAT_FLOAT "%8.6f"
		#define NUM_SAMPLES_PER_LINES 96
		#define DECLARATION_NAME "CRendBin"
		#define TAB_WITH_SPACE_OR_NOT " " /* "\t" */

		int32_t sample_rates[3] = { DEFAULT_SAMPLERATE, 32000, 16000 }; /* Hz / / 8000 Hz not supported by mdft */

		@@ -779,12 +780,7 @@ int generate_crend_ivas_tables_from_sofa( const char *file_path, bool no_optim )
		ivas_hrtf->latency_s[0] = (double *) malloc( sizeof( double ) );
		if ( latency_s == NULL )
		{
		#ifdef FIX_BINAURAL_DELAY_PRECISION
		ivas_hrtf->latency_s[0][0] = latency_48k + 0.000000001f;
		#else
		ivas_hrtf->latency_s[0][0] = latency_48k;

		#endif
		}
		else
		{
		@@ -792,11 +788,7 @@ int generate_crend_ivas_tables_from_sofa( const char *file_path, bool no_optim )
		{
		fprintf( stderr, "Warning : At sample rate %ld latency in sofa file and computed are different sofa = %f, computed = %lf\n", (long) sample_rates[indSR], latency_s->values[0], latency_48k );
		}
		#ifdef FIX_BINAURAL_DELAY_PRECISION
		ivas_hrtf->latency_s[0][0] = latency_s->values[0] + 0.000000001f;
		#else
		ivas_hrtf->latency_s[0][0] = latency_s->values[0];
		#endif
		}

		HRTFS_DATA hrtf_data = { 0 };
		@@ -820,6 +812,10 @@ int generate_crend_ivas_tables_from_sofa( const char *file_path, bool no_optim )
		ivas_set_hrtf_fr( &hrtf_data, ivas_hrtf, frame_len );
		}

		#ifdef FIX_BINAURAL_DELAY_PRECISION
		hrtf_data.latency_s += 0.000000001f;
		#endif

		if ( ( hrtf_data.num_iterations[0][0] > 2 ) )
		{
		strcpy( &lscfg.name[len_ls_cfg_name], "_BRIR" );
		@@ -871,7 +867,7 @@ int generate_crend_ivas_tables_from_sofa( const char *file_path, bool no_optim )
		/---------------------------------------------------------------------
		*write_array_float_to_file();
		---------------------------------------------------------------------/
		void write_array_float_to_file( FILE fp, float vec, int32_t size_vec, int32_t sample_per_ligne, const char *format, const int num_tab )
		void write_array_float_to_file( FILE fp, float vec, int32_t size_vec, int32_t sample_per_ligne, const char format, const int num_tab, const char tab )
		{
		int32_t k, l, num_iter, remaining_samples;
		int16_t i;
		@@ -885,7 +881,7 @@ void write_array_float_to_file( FILE fp, float vec, int32_t size_vec, int32_t
		}
		for ( i = 0; i < num_tab; i++ )
		{
		fprintf( fp, "\t" );
		fprintf( fp, "%s", tab );
		}
		fprintf( fp, "{" );

		@@ -895,7 +891,7 @@ void write_array_float_to_file( FILE fp, float vec, int32_t size_vec, int32_t
		{
		for ( i = 0; i < num_tab; i++ )
		{
		fprintf( fp, "\t" );
		fprintf( fp, "%s", tab );
		}
		}
		for ( l = 0; l < sample_per_ligne; l++ )
		@@ -907,7 +903,7 @@ void write_array_float_to_file( FILE fp, float vec, int32_t size_vec, int32_t
		}
		for ( i = 0; i < num_tab; i++ )
		{
		fprintf( fp, "\t" );
		fprintf( fp, "%s", tab );
		}
		for ( l = 0; l < remaining_samples - 1; l++ )
		{
		@@ -921,7 +917,7 @@ void write_array_float_to_file( FILE fp, float vec, int32_t size_vec, int32_t
		/---------------------------------------------------------------------
		*write_array_float_to_file();
		---------------------------------------------------------------------/
		void write_array_uint16_to_file( FILE fp, uint16_t vec, int32_t size_vec, int32_t sample_per_ligne, const int num_tab )
		void write_array_uint16_to_file( FILE fp, uint16_t vec, int32_t size_vec, int32_t sample_per_ligne, const int num_tab, const char *tab )
		{
		int32_t k, l, num_iter, remaining_samples;
		int16_t i;
		@@ -935,7 +931,7 @@ void write_array_uint16_to_file( FILE fp, uint16_t vec, int32_t size_vec, int3
		}
		for ( i = 0; i < num_tab; i++ )
		{
		fprintf( fp, "\t" );
		fprintf( fp, "%s", tab );
		}

		fprintf( fp, "{" );
		@@ -945,7 +941,7 @@ void write_array_uint16_to_file( FILE fp, uint16_t vec, int32_t size_vec, int3
		{
		for ( i = 0; i < num_tab; i++ )
		{
		fprintf( fp, "\t" );
		fprintf( fp, "%s", tab );
		}
		}
		for ( l = 0; l < sample_per_ligne; l++ )
		@@ -957,7 +953,7 @@ void write_array_uint16_to_file( FILE fp, uint16_t vec, int32_t size_vec, int3
		}
		for ( i = 0; i < num_tab; i++ )
		{
		fprintf( fp, "\t" );
		fprintf( fp, "%s", tab );
		}
		for ( l = 0; l < remaining_samples - 1; l++ )
		{
		@@ -967,7 +963,7 @@ void write_array_uint16_to_file( FILE fp, uint16_t vec, int32_t size_vec, int3
		fprintf( fp, "%u", vec[k * sample_per_ligne + l] );
		for ( i = 0; i < num_tab; i++ )
		{
		fprintf( fp, "\t" );
		fprintf( fp, "%s", tab );
		}
		fprintf( fp, "}" );
		}
		@@ -1067,15 +1063,15 @@ void update_c_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int
		for ( i = 0; i < hrtf->max_num_ir - 1; i++ )
		{
		fprintf( fp, "{" );
		write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max[i][0], hrtf->max_num_iterations, hrtf->max_num_iterations, 0 );
		write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max[i][0], hrtf->max_num_iterations, hrtf->max_num_iterations, 0, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, "," );
		write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max[i][1], hrtf->max_num_iterations, hrtf->max_num_iterations, 0 );
		write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max[i][1], hrtf->max_num_iterations, hrtf->max_num_iterations, 0, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, "}," );
		}
		fprintf( fp, "{" );
		write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max[i][0], hrtf->max_num_iterations, hrtf->max_num_iterations, 0 );
		write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max[i][0], hrtf->max_num_iterations, hrtf->max_num_iterations, 0, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, "," );
		write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max[i][1], hrtf->max_num_iterations, hrtf->max_num_iterations, 0 );
		write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max[i][1], hrtf->max_num_iterations, hrtf->max_num_iterations, 0, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, "}" );
		fprintf( fp, "};" );

		@@ -1084,7 +1080,7 @@ void update_c_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int

		/* float inv_diffuse_weight[MAX_INTERN_CHANNELS]; */
		fprintf( fp, "\nconst float %s_%s_inv_diffuse_weight_%2dkHz[%u]=", DECLARATION_NAME, lscfg.name, samplerate / 1000, hrtf->max_num_ir );
		write_array_float_to_file( fp, hrtf->inv_diffuse_weight, hrtf->max_num_ir, hrtf->max_num_ir, FORMAT_FLOAT, 0 );
		write_array_float_to_file( fp, hrtf->inv_diffuse_weight, hrtf->max_num_ir, hrtf->max_num_ir, FORMAT_FLOAT, 0, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, ";" );

		/* uint16_t pIndex_frequency_max_diffuse[BINAURAL_CHANNELS];/
		@@ -1095,9 +1091,9 @@ void update_c_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int
		else
		{
		fprintf( fp, "\nconst uint16_t %s_%s_pIndex_frequency_max_diffuse_%2dkHz[BINAURAL_CHANNELS][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, ( hrtf->num_iterations_diffuse[0] > hrtf->num_iterations_diffuse[1] ) ? hrtf->num_iterations_diffuse[0] : hrtf->num_iterations_diffuse[1] );
		write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max_diffuse[0], hrtf->num_iterations_diffuse[0], hrtf->num_iterations_diffuse[0], 0 );
		write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max_diffuse[0], hrtf->num_iterations_diffuse[0], hrtf->num_iterations_diffuse[0], 0, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, "," );
		write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max_diffuse[1], hrtf->num_iterations_diffuse[1], hrtf->num_iterations_diffuse[1], 0 );
		write_array_uint16_to_file( fp, hrtf->pIndex_frequency_max_diffuse[1], hrtf->num_iterations_diffuse[1], hrtf->num_iterations_diffuse[1], 0, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, "};" );
		}

		@@ -1106,15 +1102,15 @@ void update_c_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int
		for ( i = 0; i < hrtf->max_num_ir - 1; i++ )
		{
		fprintf( fp, "\n\t{\n" );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_re[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2 );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_re[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, ",\n" );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_re[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2 );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_re[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, "\n\t}," );
		}
		fprintf( fp, "\n\t{\n" );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_re[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2 );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_re[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, ",\n" );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_re[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2 );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_re[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, "\n\t}" );
		fprintf( fp, "\n};" );

		@@ -1122,15 +1118,15 @@ void update_c_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int
		for ( i = 0; i < hrtf->max_num_ir - 1; i++ )
		{
		fprintf( fp, "\n\t{\n" );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2 );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, ",\n" );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2 );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, "\n\t}," );
		}
		fprintf( fp, "\n\t{\n" );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2 );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][0], pTotalNumFreqSampPerIterations[0][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, ",\n" );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2 );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_im[i][1], pTotalNumFreqSampPerIterations[1][i], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, "\n\t}" );
		fprintf( fp, "\n};" );

		@@ -1142,9 +1138,9 @@ void update_c_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int
		else
		{
		fprintf( fp, "\nconst float %s_%s_coeff_diffuse_re_%2dkHz[BINAURAL_CHANNELS][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, maxTotalNumFreqSampPerIterationsDiffuse );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_re[0], pTotalNumFreqSampPerIterationsDiffuse[0], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2 );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_re[0], pTotalNumFreqSampPerIterationsDiffuse[0], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, ",\n" );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_re[1], pTotalNumFreqSampPerIterationsDiffuse[1], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2 );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_re[1], pTotalNumFreqSampPerIterationsDiffuse[1], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, "\n};" );
		}

		@@ -1156,9 +1152,9 @@ void update_c_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int
		else
		{
		fprintf( fp, "\nconst float %s_%s_coeff_diffuse_im_%2dkHz[BINAURAL_CHANNELS][%u]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, maxTotalNumFreqSampPerIterationsDiffuse );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_im[0], pTotalNumFreqSampPerIterationsDiffuse[0], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2 );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_im[0], pTotalNumFreqSampPerIterationsDiffuse[0], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, ",\n" );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_im[1], pTotalNumFreqSampPerIterationsDiffuse[1], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2 );
		write_array_float_to_file( fp, hrtf->pOut_to_bin_diffuse_im[1], pTotalNumFreqSampPerIterationsDiffuse[1], NUM_SAMPLES_PER_LINES, FORMAT_FLOAT, 2, TAB_WITH_SPACE_OR_NOT );
		fprintf( fp, "\n};" );
		}