[cleanup] merge FIX_BINAURAL_DELAY_PRECISION into UPDATE_SBA_FILTER (7799edff) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,6 @@
		#define REND_DEBUGGING_REVISION /* VA: encapsulate rendering debugging options with DEBUGGING */


		#define FIX_BINAURAL_DELAY_PRECISION
		#define USE_HRIR_128_METH5_IRC_53_Q10_SYML_ITRP1_48000
		#define UPDATE_SBA_FILTER
		#define UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS

lib_rend/ivas_rom_binaural_crend_head.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@

		/******************** CRendBin_Combined_HRIR ********************/

		#ifdef FIX_BINAURAL_DELAY_PRECISION
		#ifdef UPDATE_SBA_FILTER
		const float CRendBin_Combined_HRIR_latency_s = 0.000020834f;
		#else
		const float CRendBin_Combined_HRIR_latency_s = 0.000020833333110f;
		@@ -654,7 +654,7 @@ const float *CRendBin_Combined_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={N

		/******************** CRendBin_HOA3_HRIR ********************/

		#ifdef FIX_BINAURAL_DELAY_PRECISION
		#ifdef UPDATE_SBA_FILTER
		const float CRendBin_HOA3_HRIR_latency_s = 0.001333334f;
		#else
		const float CRendBin_HOA3_HRIR_latency_s = 0.001333333319053f;
		@@ -1610,7 +1610,7 @@ const float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,

		/******************** CRendBin_FOA_HRIR ********************/

		#ifdef FIX_BINAURAL_DELAY_PRECISION
		#ifdef UPDATE_SBA_FILTER
		const float CRendBin_FOA_HRIR_latency_s = 0.000020834f;
		#else
		const float CRendBin_FOA_HRIR_latency_s = 0.000020833333110f;
		@@ -1814,7 +1814,7 @@ const float *CRendBin_FOA_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,N

		/******************** CRendBin_HOA2_HRIR ********************/

		#ifdef FIX_BINAURAL_DELAY_PRECISION
		#ifdef UPDATE_SBA_FILTER
		const float CRendBin_HOA2_HRIR_latency_s = 0.000020834f;
		#else
		const float CRendBin_HOA2_HRIR_latency_s = 0.000020833333110f;
		@@ -2198,7 +2198,7 @@ const float *CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,

		/******************** CRendBin_HOA3_HRIR ********************/

		#ifdef FIX_BINAURAL_DELAY_PRECISION
		#ifdef UPDATE_SBA_FILTER
		const float CRendBin_HOA3_HRIR_latency_s = 0.000020834f;
		#else
		const float CRendBin_HOA3_HRIR_latency_s = 0.000020833333110f;
		@@ -2833,7 +2833,7 @@ const float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,

		/******************** CRendBin_Combined_BRIR ********************/

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

scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -854,7 +854,7 @@ 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
		#ifdef UPDATE_SBA_FILTER
		hrtf_data.latency_s += 0.000000001f;
		#endif

		@@ -1034,7 +1034,7 @@ void update_c_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int
		{
		/* float latency_s; */
		fprintf( fp, "\n\n/******************** %s_%s ********************/\n", DECLARATION_NAME, lscfg.name );
		#ifdef FIX_BINAURAL_DELAY_PRECISION
		#ifdef UPDATE_SBA_FILTER
		fprintf( fp, "\n#ifdef FIX_BINAURAL_DELAY_PRECISION\nconst float %s_%s_latency_s = %10.9ff;\n#else", DECLARATION_NAME, lscfg.name, hrtf->latency_s );
		fprintf( fp, "\nconst float %s_%s_latency_s = %16.15ff;\n#endif", DECLARATION_NAME, lscfg.name, hrtf->latency_s - 0.000000001f );
		#else