[cleanup] strip USE_IIS_BRIR_OFFICIALMPEG_COMBINED (redundant) + reorganize options.h (e8af297d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -174,18 +174,12 @@

		#define FIX_BINAURAL_DELAY_PRECISION
		#define USE_HRIR_128_METH5_IRC_53_Q10_SYML_ITRP1_48000
		#define USE_IIS_BRIR_OFFICIALMPEG_COMBINED
		#define UPDATE_SBA_FILTER
		//#ifdef UPDATE_SBA_FILTER
		#define UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS
		//#ifdef UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS
		#define USE_HRIR_128_48000_DOLBY_SBA1
		#define USE_HRIR_128_48000_DOLBY_SBA2
		//#endif
		#define USE_HRIR_128_48000_DOLBY_SBA3
		//#else
		//#define USE_ORANGE_HRIR_53_HOA3S_48000
		//#endif

		/* ################## End DEVELOPMENT switches ######################### */
		/* clang-format on */

lib_rend/ivas_rom_binaural_crend_head.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2829,7 +2829,6 @@ const float *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]={NULL,
		const float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,NULL};
		#endif /* USE_HRIR_128_48000_DOLBY_SBA3 */

		#ifdef USE_IIS_BRIR_OFFICIALMPEG_COMBINED


		/******************** CRendBin_Combined_BRIR ********************/
		@@ -8159,6 +8158,5 @@ const float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][252
		0.018358f, -0.020195f, 0.012285f, -0.036205f, -0.000230f, -0.019486f, 0.021761f, -0.002862f, 0.002417f, -0.003265f, -0.021068f, -0.000886f, 0.017137f, 0.047554f, 0.002807f, 0.003558f, 0.009315f, 0.016659f, -0.003390f, -0.003905f, 0.000798f, -0.000180f, 0.040620f, -0.003109f, 0.005685f, 0.017226f, -0.016770f, -0.026851f, -0.000591f, -0.028399f, -0.004244f, -0.014234f, -0.011375f, -0.005117f, -0.012932f, 0.007654f, 0.009595f, -0.016141f, 0.020769f, 0.018611f, -0.003081f, -0.003444f, -0.017888f, 0.013329f, 0.004146f, 0.044256f, 0.048210f, 0.000359f, -0.014792f, -0.011865f, 0.040392f, -0.026530f, -0.030252f, 0.031509f, -0.028569f, 0.018427f, 0.005621f, 0.025515f, 0.023514f, 0.015908f, 0.002584f, -0.016001f, -0.013823f, 0.033133f, -0.013996f, -0.001348f, 0.008121f, 0.028260f, 0.040839f, -0.001144f, 0.027926f, -0.022702f, -0.023750f, 0.002818f, -0.008721f, 0.013302f, 0.008430f, -0.020183f, 0.002868f, 0.013112f, 0.033640f, 0.011641f, 0.013855f, 0.012837f, 0.015118f, 0.004113f, -0.001054f, 0.021560f, 0.003879f, 0.017326f, 0.027403f, 0.006026f, -0.011061f, -0.009150f, 0.024733f, 0.006850f,
		0.050578f, 0.012222f, 0.020049f, -0.020057f, -0.032135f, -0.002553f, -0.037541f, -0.023567f, -0.008392f, -0.012215f, 0.001644f, -0.001142f, 0.000540f, 0.001404f, -0.027979f, -0.022362f, -0.012091f, -0.022963f, 0.009075f, 0.010977f, -0.007069f, -0.000183f, -0.022228f, -0.001348f, 0.006548f, -0.003034f}
		};
		#endif /* USE_IIS_BRIR_OFFICIALMPEG_COMBINED */


		#undef WMC_TOOL_SKIP

lib_rend/ivas_rom_binaural_crend_head.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -297,7 +297,6 @@ extern float *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS];
		extern float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS];
		#endif /* USE_HRIR_128_48000_DOLBY_SBA3 */

		#ifdef USE_IIS_BRIR_OFFICIALMPEG_COMBINED


		/******************** CRendBin_Combined_BRIR ********************/
		@@ -345,6 +344,4 @@ extern float CRendBin_Combined_BRIR_coeff_re_16kHz[15][BINAURAL_CHANNELS][1774];
		extern float CRendBin_Combined_BRIR_coeff_im_16kHz[15][BINAURAL_CHANNELS][1774];
		extern float CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS][2522];
		extern float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][2522];
		#endif /* USE_IIS_BRIR_OFFICIALMPEG_COMBINED */

		#endif /* _IVAS_ROM_BINAURAL_CREND_HEAD_ */