[fix] revert to float ROM tables for FastConv and ParamBin, keep 16bit binary file format (e0ce8dd8) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -168,8 +168,9 @@
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#define FIX_1123_CREND_16BIT_ROM
		#define FIX_1123_TDREN_16BIT_ROM
		#define FIX_1123_FASTCONV_16BIT_ROM /* FhG: issue 1123: update FastConv ROM tables and scripts to generate 16 bit tables instead of float */
		#define FIX_1123_PARAMBIN_16BIT_ROM /* FhG,Nok: issue 1123: update ParamBin ROM tables and scripts to generate 16 bit tables instead of float */
		/#define FIX_1123_FASTCONV_16BIT_ROM/ /* FhG: issue 1123: update FastConv ROM tables to 16 bit (must regenerate ROM file!) */
		#define FIX_1123_FASTCONV_16BIT_FMT /* FhG: issue 1123: update FastConv binary file format and scripts to 16 bit */
		/#define FIX_1123_PARAMBIN_16BIT_ROM/ /* FhG,Nok: issue 1123: update ParamBin ROM tables and scripts to generate 16 bit tables instead of float */
		#endif
		#define FIX_BASOP_812_NAN_COHSNR /* FhG: BASOP issue 812: fix nan values in sparse frames for cohSNR value in ITD estimation*/

lib_dec/ivas_binRenderer_internal.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@ static ivas_error ivas_binRenderer_convModuleOpen(

		if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		#ifdef FIX_1123_FASTCONV_16BIT_FMT
		hBinRenConvModule->numTaps = hHrtf->ntaps_brir;
		#else
		hBinRenConvModule->numTaps = BINAURAL_NTAPS_MAX;
		@@ -200,7 +200,7 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		{
		if ( hBinRenderer->ivas_format == SBA_FORMAT )
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		#ifdef FIX_1123_FASTCONV_16BIT_FMT
		if ( input_config == IVAS_AUDIO_CONFIG_HOA3 )
		{
		hBinRenConvModule->numTaps = hHrtf->ntaps_hrir_hoa3;
		@@ -223,7 +223,7 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		}
		else
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		#ifdef FIX_1123_FASTCONV_16BIT_FMT
		hBinRenConvModule->numTaps = hHrtf->ntaps_hrir;
		#else
		hBinRenConvModule->numTaps = BINAURAL_NTAPS;
		@@ -493,7 +493,8 @@ void ivas_init_binaural_hrtf(

		#ifndef FIX_1123_FASTCONV_16BIT_ROM
		HrtfFastConv->allocate_init_flag = 0x00;
		#else
		#endif
		#ifdef FIX_1123_FASTCONV_16BIT_FMT
		HrtfFastConv->ntaps_hrir = BINAURAL_NTAPS;
		HrtfFastConv->ntaps_hrir_foa = BINAURAL_NTAPS_SBA;
		HrtfFastConv->ntaps_hrir_hoa2 = BINAURAL_NTAPS_SBA;
		@@ -719,7 +720,7 @@ ivas_error ivas_allocate_binaural_hrtf(
		}
		}

		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		#ifdef FIX_1123_FASTCONV_16BIT_FMT
		if ( ( ( renderer_type == RENDERER_BINAURAL_FASTCONV ) && ( bin_input_config == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) ) \|\| ( ( renderer_type == RENDERER_BINAURAL_FASTCONV ) && ( input_config != IVAS_AUDIO_CONFIG_INVALID ) ) )
		#else
		if ( renderer_type == RENDERER_BINAURAL_FASTCONV \|\| bin_input_config == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )
		@@ -765,7 +766,7 @@ ivas_error ivas_allocate_binaural_hrtf(
		}
		}

		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		#ifdef FIX_1123_FASTCONV_16BIT_FMT
		if ( ( ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && ( bin_input_config == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) ) \|\| ( ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && ( input_config != IVAS_AUDIO_CONFIG_INVALID ) ) )
		#else
		if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM \|\| bin_input_config == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )

lib_rend/ivas_rom_binauralRenderer.c

+46027 −46054

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_rom_binauralRenderer.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -138,9 +138,6 @@ extern int16_t hrtfShCoeffs_factorQ;
		extern int16_t hrtfShCoeffsRe[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];
		extern int16_t hrtfShCoeffsIm[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];

		/* Binaural rendering data set based on BRIRs, to be used in a combined manner
		* with the above binaural rendering data set based on HRIRs for parametric
		* renderer */
		extern const int16_t parametricReverberationTimes_factorQ;
		extern const int16_t parametricReverberationEneCorrections_factorQ;
		extern const int16_t parametricEarlyPartEneCorrection_factorQ;
		@@ -154,9 +151,6 @@ extern const int16_t parametricEarlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX];
		extern float hrtfShCoeffsRe[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];
		extern float hrtfShCoeffsIm[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];

		/* Binaural rendering data set based on BRIRs, to be used in a combined manner
		* with the above binaural rendering data set based on HRIRs for parametric
		* renderer */
		extern const float parametricReverberationTimes[CLDFB_NO_CHANNELS_MAX];
		extern const float parametricReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX];
		extern const float parametricEarlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX];

lib_rend/ivas_stat_rend.h

+4 −3

Original line number	Diff line number	Diff line
		@@ -1263,7 +1263,7 @@ typedef struct ivas_hrtfs_crend_structure
		typedef struct ivas_hrtfs_fastconv_struct
		{
		float FASTCONV_HOA3_latency_s;
		#ifndef FIX_1123_FASTCONV_16BIT_ROM
		#ifndef FIX_1123_FASTCONV_16BIT_FMT
		float FASTCONV_HRIR_latency_s;
		#endif
		float ***leftHRIRReal_HOA3;
		@@ -1271,7 +1271,7 @@ typedef struct ivas_hrtfs_fastconv_struct
		float ***rightHRIRReal_HOA3;
		float ***rightHRIRImag_HOA3;

		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		#ifdef FIX_1123_FASTCONV_16BIT_FMT
		float FASTCONV_HRIR_latency_s;
		#endif
		float ***leftHRIRReal;
		@@ -1299,7 +1299,8 @@ typedef struct ivas_hrtfs_fastconv_struct

		#ifndef FIX_1123_FASTCONV_16BIT_ROM
		int16_t allocate_init_flag; /Memory allocation flag 0: if the hrtf pointers are allocated at application level , 1: of allocated at ivas_binaural_hrtf_open() /
		#else
		#endif
		#ifdef FIX_1123_FASTCONV_16BIT_FMT
		uint16_t ntaps_hrir;
		uint16_t ntaps_hrir_hoa3;
		uint16_t ntaps_hrir_hoa2;