sync (5f10f235) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_binRenderer_internal.c

+17 −17

Original line number	Diff line number	Diff line
		@@ -817,7 +817,8 @@ static ivas_error ivas_binaural_hrtf_open(
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		int16_t i, j, k;
		float scaleFactor;
		float scaleFactor = 1.f;
		float scaleFactorSBA = 1.f;
		#else
		int16_t i, j;
		#endif
		@@ -892,17 +893,16 @@ static ivas_error ivas_binaural_hrtf_open(
		}
		if ( input_config == IVAS_AUDIO_CONFIG_HOA3 )
		{
		scaleFactor = powf( 2.f, -1.f * (float) FASTCONV_HRIR_HOA3_factorQ );
		scaleFactorSBA = powf( 2.f, -1.f * (float) FASTCONV_HRIR_HOA3_factorQ );
		}
		else if ( input_config == IVAS_AUDIO_CONFIG_HOA2 )
		{
		scaleFactor = powf( 2.f, -1.f * (float) FASTCONV_HRIR_HOA2_factorQ );
		scaleFactorSBA = powf( 2.f, -1.f * (float) FASTCONV_HRIR_HOA2_factorQ );
		}
		else if ( input_config == IVAS_AUDIO_CONFIG_FOA )
		{
		scaleFactor = powf( 2.f, -1.f * (float) FASTCONV_HRIR_FOA_factorQ );
		scaleFactorSBA = powf( 2.f, -1.f * (float) FASTCONV_HRIR_FOA_factorQ );
		}

		HrtfFastConv->allocate_init_flag = 0; /* TODO: consider getting rid of this flag entirely? */
		#else
		HrtfFastConv->allocate_init_flag = 1;
		@@ -961,10 +961,10 @@ static ivas_error ivas_binaural_hrtf_open(
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		for ( k = 0; k < HrtfFastConv->ntaps_hrir_hoa3; k++ )
		{
		HrtfFastConv->leftHRIRReal_HOA3[i][j][k] = (float) leftHRIRReal_HOA3[i][j][k] * scaleFactor;
		HrtfFastConv->leftHRIRImag_HOA3[i][j][k] = (float) leftHRIRImag_HOA3[i][j][k] * scaleFactor;
		HrtfFastConv->rightHRIRReal_HOA3[i][j][k] = (float) rightHRIRReal_HOA3[i][j][k] * scaleFactor;
		HrtfFastConv->rightHRIRImag_HOA3[i][j][k] = (float) rightHRIRImag_HOA3[i][j][k] * scaleFactor;
		HrtfFastConv->leftHRIRReal_HOA3[i][j][k] = (float) leftHRIRReal_HOA3[i][j][k] * scaleFactorSBA;
		HrtfFastConv->leftHRIRImag_HOA3[i][j][k] = (float) leftHRIRImag_HOA3[i][j][k] * scaleFactorSBA;
		HrtfFastConv->rightHRIRReal_HOA3[i][j][k] = (float) rightHRIRReal_HOA3[i][j][k] * scaleFactorSBA;
		HrtfFastConv->rightHRIRImag_HOA3[i][j][k] = (float) rightHRIRImag_HOA3[i][j][k] * scaleFactorSBA;
		}
		#else
		HrtfFastConv->leftHRIRReal_HOA3[i][j] = leftHRIRReal_HOA3[i][j];
		@@ -984,10 +984,10 @@ static ivas_error ivas_binaural_hrtf_open(
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		for ( k = 0; k < HrtfFastConv->ntaps_hrir_hoa2; k++ )
		{
		HrtfFastConv->leftHRIRReal_HOA2[i][j][k] = (float) leftHRIRReal_HOA2[i][j][k] * scaleFactor;
		HrtfFastConv->leftHRIRImag_HOA2[i][j][k] = (float) leftHRIRImag_HOA2[i][j][k] * scaleFactor;
		HrtfFastConv->rightHRIRReal_HOA2[i][j][k] = (float) rightHRIRReal_HOA2[i][j][k] * scaleFactor;
		HrtfFastConv->rightHRIRImag_HOA2[i][j][k] = (float) rightHRIRImag_HOA2[i][j][k] * scaleFactor;
		HrtfFastConv->leftHRIRReal_HOA2[i][j][k] = (float) leftHRIRReal_HOA2[i][j][k] * scaleFactorSBA;
		HrtfFastConv->leftHRIRImag_HOA2[i][j][k] = (float) leftHRIRImag_HOA2[i][j][k] * scaleFactorSBA;
		HrtfFastConv->rightHRIRReal_HOA2[i][j][k] = (float) rightHRIRReal_HOA2[i][j][k] * scaleFactorSBA;
		HrtfFastConv->rightHRIRImag_HOA2[i][j][k] = (float) rightHRIRImag_HOA2[i][j][k] * scaleFactorSBA;
		}
		#else
		HrtfFastConv->leftHRIRReal_HOA2[i][j] = leftHRIRReal_HOA2[i][j];
		@@ -1007,10 +1007,10 @@ static ivas_error ivas_binaural_hrtf_open(
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		for ( k = 0; k < HrtfFastConv->ntaps_hrir_foa; k++ )
		{
		HrtfFastConv->leftHRIRReal_FOA[i][j][k] = (float) leftHRIRReal_FOA[i][j][k] * scaleFactor;
		HrtfFastConv->leftHRIRImag_FOA[i][j][k] = (float) leftHRIRImag_FOA[i][j][k] * scaleFactor;
		HrtfFastConv->rightHRIRReal_FOA[i][j][k] = (float) rightHRIRReal_FOA[i][j][k] * scaleFactor;
		HrtfFastConv->rightHRIRImag_FOA[i][j][k] = (float) rightHRIRImag_FOA[i][j][k] * scaleFactor;
		HrtfFastConv->leftHRIRReal_FOA[i][j][k] = (float) leftHRIRReal_FOA[i][j][k] * scaleFactorSBA;
		HrtfFastConv->leftHRIRImag_FOA[i][j][k] = (float) leftHRIRImag_FOA[i][j][k] * scaleFactorSBA;
		HrtfFastConv->rightHRIRReal_FOA[i][j][k] = (float) rightHRIRReal_FOA[i][j][k] * scaleFactorSBA;
		HrtfFastConv->rightHRIRImag_FOA[i][j][k] = (float) rightHRIRImag_FOA[i][j][k] * scaleFactorSBA;
		}
		#else
		HrtfFastConv->leftHRIRReal_FOA[i][j] = leftHRIRReal_FOA[i][j];

lib_rend/ivas_rom_TdBinauralRenderer.c

+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.

		*******************************************************************************************************/
		/* Generated on 16-Jul-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 */
		/* Generated on 18-Jul-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 */


		/* clang-format off */

lib_rend/ivas_rom_binauralRenderer.c

+10 −10

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 16-Jul-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64
		* Generated on 18-Jul-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64
		*/


		@@ -46955,19 +46955,19 @@ const int16_t rightBRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS
		const int16_t fastconvReverberationTimes_factorQ = 15;
		const int16_t fastconvReverberationTimes[CLDFB_NO_CHANNELS_MAX] =
		{
		13725, 6792, 6652, 6788, 7095, 7735, 7554, 7509, 7471, 7205, 7392, 7237, 7330, 7306, 7327, 7449, 7454, 7331, 7214, 7168, 7223, 7152, 6988, 6892, 6797, 6513, 6431, 6387, 6237, 6046, 5909, 5773, 5784, 5819, 6016, 6420, 6660, 6829, 7034, 7209, 7305, 7550, 7665, 7656, 7744, 7780, 7918, 7901, 7827, 7942, 8102, 8059, 8133, 8041, 7994, 7999, 7828, 7950, 7695, 8292,
		22832, 16220, 14871, 13951, 13924, 12018, 11556, 11198, 10950, 10453, 9907, 9708, 9328, 9142, 8866, 8689, 8421, 8162, 7873, 7711, 7564, 7452, 7220, 7108, 6977, 6690, 6600, 6507, 6371, 6207, 5961, 5865, 5917, 6059, 7086, 11641, 15707, 19199, 19765, 19732, 18915, 18975, 18661, 17867, 17165, 17187, 17793, 17853, 18601, 18552, 19579, 20103, 21422, 22722, 23566, 23765, 23729, 23033, 22121, 21493,
		};


		const int16_t fastconvReverberationEneCorrections_factorQ = 15;
		const int16_t fastconvReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX] =
		{
		19, 7, 8, 7, 8, 50, 38, 36, 41, 43, 76, 80, 88, 89, 86, 84, 90, 89, 85, 83, 112, 58, 32, 23, 20, 18, 17, 19, 20, 18, 41, 40, 31, 20, 9, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
		23, 7, 8, 7, 9, 50, 38, 36, 42, 43, 76, 80, 88, 89, 86, 84, 90, 89, 86, 83, 112, 58, 32, 23, 20, 18, 17, 19, 20, 18, 41, 40, 31, 20, 9, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
		};


		/*
		* Generated on 16-Jul-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64
		* Generated on 18-Jul-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64
		* Binaural rendering data set based on BRIRs
		Tables derived from Mozart IIS BRIRs.*/

		@@ -47503,12 +47503,12 @@ const int16_t hrtfShCoeffsIm[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]

		const int16_t parametricReverberationTimes_factorQ = 15;
		const int16_t parametricReverberationTimes[CLDFB_NO_CHANNELS_MAX] = {
		11321, 10468, 10910, 11827, 12265, 12150, 11751, 11407, 11243, 10858,
		10371, 9993, 9662, 9422, 9172, 8856, 8652, 8402, 8189, 7931,
		7703, 7525, 7331, 7169, 6966, 6806, 6622, 6491, 6354, 6092,
		5986, 5962, 5891, 5868, 5785, 5647, 5607, 5503, 5504, 5545,
		5483, 5437, 5360, 5294, 5191, 5133, 5091, 5033, 4967, 4914,
		4856, 4799, 4741, 4684, 4626, 4568, 4511, 4453, 4395, 4338
		12005, 10886, 11324, 12496, 12793, 12578, 12266, 11950, 11758, 11340,
		10834, 10530, 10210, 10014, 9780, 9541, 9260, 9054, 8856, 8606,
		8367, 8196, 8068, 7902, 7511, 7474, 7277, 7092, 6590, 6606,
		6486, 6567, 6557, 6737, 6764, 6042, 6159, 6224, 6384, 6685,
		6656, 6619, 6482, 6420, 6256, 6212, 6198, 6179, 6157, 6145,
		6119, 6093, 6067, 6041, 6015, 5989, 5963, 5936, 5910, 5884
		};

scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin

LFS

(132 B)

File changed.

No diff preview for this file type.

View original file

View changed file

scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin

LFS

(132 B)

File changed.

No diff preview for this file type.

View original file

View changed file