replace constants with macros HRTF_LS_CHANNELS and introduce BINAURAL_NTAPS (970649f1) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_cnst.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -1353,6 +1353,9 @@ typedef enum

		#define BINAURAL_MAXBANDS 60 /* Max number of bands */
		#define BINAURAL_CONVBANDS 50 /* Bands upto which convolution is performed */
		#ifdef HRTF_BINARY_FASTCONV
		#define BINAURAL_NTAPS 7
		#endif
		#define BINAURAL_NTAPS_MAX 96

		#define HRTF_SH_ORDER 3

lib_rend/ivas_rom_binauralRenderer.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@
		*/
		const float FASTCONV_HOA3_latency_s = 0.001979167f;
		#ifdef HRTF_BINARY_FASTCONV
		const float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7]=
		const float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]=
		#else
		const float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][16][7]=
		#endif
		@@ -961,7 +961,7 @@ const float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][16][7]=
		};

		#ifdef HRTF_BINARY_FASTCONV
		const float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7]=
		const float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]=
		#else
		const float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][16][7]=
		#endif
		@@ -1869,7 +1869,7 @@ const float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][16][7]=
		};

		#ifdef HRTF_BINARY_FASTCONV
		const float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7]=
		const float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]=
		#else
		const float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][16][7]=
		#endif
		@@ -2777,7 +2777,7 @@ const float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][16][7]=
		};

		#ifdef HRTF_BINARY_FASTCONV
		const float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7]=
		const float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]=
		#else
		const float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][16][7]=
		#endif
		@@ -3686,7 +3686,7 @@ const float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][16][7]=

		const float FASTCONV_HRIR_latency_s = 0.000666667f;
		#ifdef HRTF_BINARY_FASTCONV
		const float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][7]=
		const float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]=
		#else
		const float leftHRIRReal[BINAURAL_CONVBANDS][15][7]=
		#endif
		@@ -4544,7 +4544,7 @@ const float leftHRIRReal[BINAURAL_CONVBANDS][15][7]=
		};

		#ifdef HRTF_BINARY_FASTCONV
		const float leftHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][7]=
		const float leftHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]=
		#else
		const float leftHRIRImag[BINAURAL_CONVBANDS][15][7]=
		#endif
		@@ -5402,7 +5402,7 @@ const float leftHRIRImag[BINAURAL_CONVBANDS][15][7]=
		};

		#ifdef HRTF_BINARY_FASTCONV
		const float rightHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][7]=
		const float rightHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]=
		#else
		const float rightHRIRReal[BINAURAL_CONVBANDS][15][7]=
		#endif
		@@ -6260,7 +6260,7 @@ const float rightHRIRReal[BINAURAL_CONVBANDS][15][7]=
		};

		#ifdef HRTF_BINARY_FASTCONV
		const float rightHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][7]=
		const float rightHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]=
		#else
		const float rightHRIRImag[BINAURAL_CONVBANDS][15][7]=
		#endif

lib_rend/ivas_rom_binauralRenderer.h

+8 −8

Original line number	Diff line number	Diff line
		@@ -45,10 +45,10 @@
		/* Binaural rendering data set based on HRIRs */
		extern const float FASTCONV_HRIR_latency_s;
		#ifdef HRTF_BINARY_FASTCONV
		extern float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7];
		extern float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7];
		extern float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7];
		extern float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7];
		extern float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS];
		extern float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS];
		extern float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS];
		extern float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS];
		#else
		extern float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][16][7];
		extern float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][16][7];
		@@ -57,10 +57,10 @@ extern float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][16][7];
		#endif

		#ifdef HRTF_BINARY_FASTCONV
		extern float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][7];
		extern float leftHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][7];
		extern float rightHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][7];
		extern float rightHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][7];
		extern float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS];
		extern float leftHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS];
		extern float rightHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS];
		extern float rightHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS];
		#else
		extern float leftHRIRReal[BINAURAL_CONVBANDS][15][7];
		extern float leftHRIRImag[BINAURAL_CONVBANDS][15][7];

lib_util/hrtf_file_reader.c

+28 −28

Original line number	Diff line number	Diff line
		@@ -842,12 +842,12 @@ static ivas_error init_fastconv_HRTF_handle(
		hHrtf->FASTCONV_HRIR_latency_s = 0;
		for ( i = 0; i < BINAURAL_CONVBANDS; i++ )
		{
		for ( j = 0; j < 15; j++ )
		for ( j = 0; j < HRTF_LS_CHANNELS; j++ )
		{
		set_zero( hHrtf->leftHRIRReal[i][j], 7 );
		set_zero( hHrtf->leftHRIRImag[i][j], 7 );
		set_zero( hHrtf->rightHRIRReal[i][j], 7 );
		set_zero( hHrtf->rightHRIRImag[i][j], 7 );
		set_zero( hHrtf->leftHRIRReal[i][j], BINAURAL_NTAPS );
		set_zero( hHrtf->leftHRIRImag[i][j], BINAURAL_NTAPS );
		set_zero( hHrtf->rightHRIRReal[i][j], BINAURAL_NTAPS );
		set_zero( hHrtf->rightHRIRImag[i][j], BINAURAL_NTAPS );
		}
		}

		@@ -856,17 +856,17 @@ static ivas_error init_fastconv_HRTF_handle(
		{
		for ( j = 0; j < HRTF_SH_CHANNELS; j++ )
		{
		set_zero( hHrtf->leftHRIRReal_HOA3[i][j], 7 );
		set_zero( hHrtf->leftHRIRImag_HOA3[i][j], 7 );
		set_zero( hHrtf->rightHRIRReal_HOA3[i][j], 7 );
		set_zero( hHrtf->rightHRIRImag_HOA3[i][j], 7 );
		set_zero( hHrtf->leftHRIRReal_HOA3[i][j], BINAURAL_NTAPS );
		set_zero( hHrtf->leftHRIRImag_HOA3[i][j], BINAURAL_NTAPS );
		set_zero( hHrtf->rightHRIRReal_HOA3[i][j], BINAURAL_NTAPS );
		set_zero( hHrtf->rightHRIRImag_HOA3[i][j], BINAURAL_NTAPS );
		}
		}

		hHrtf->FASTCONV_BRIR_latency_s = 0;
		for ( i = 0; i < BINAURAL_CONVBANDS; i++ )
		{
		for ( j = 0; j < 15; j++ )
		for ( j = 0; j < HRTF_LS_CHANNELS; j++ )
		{
		set_zero( hHrtf->leftBRIRReal[i][j], BINAURAL_NTAPS_MAX );
		set_zero( hHrtf->leftBRIRImag[i][j], BINAURAL_NTAPS_MAX );
		@@ -926,7 +926,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata(
		}
		hrtf_data_rptr += sizeof( uint16_t );

		if ( 7 != ( (uint16_t ) ( hrtf_data_rptr ) ) )
		if ( BINAURAL_NTAPS != ( (uint16_t ) ( hrtf_data_rptr ) ) )
		{
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS)" );
		}
		@@ -936,32 +936,32 @@ static ivas_error create_fastconv_HRTF_from_rawdata(
		{
		for ( j = 0; j < HRTF_LS_CHANNELS; j++ )
		{
		memcpy( ( hHRTF )->leftHRIRReal[i][j], hrtf_data_rptr, 7 sizeof( float ) );
		hrtf_data_rptr += 7 * sizeof( float );
		memcpy( ( hHRTF )->leftHRIRReal[i][j], hrtf_data_rptr, BINAURAL_NTAPS sizeof( float ) );
		hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float );
		}
		}
		for ( i = 0; i < BINAURAL_CONVBANDS; i++ )
		{
		for ( j = 0; j < HRTF_LS_CHANNELS; j++ )
		{
		memcpy( ( hHRTF )->leftHRIRImag[i][j], hrtf_data_rptr, 7 sizeof( float ) );
		hrtf_data_rptr += 7 * sizeof( float );
		memcpy( ( hHRTF )->leftHRIRImag[i][j], hrtf_data_rptr, BINAURAL_NTAPS sizeof( float ) );
		hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float );
		}
		}
		for ( i = 0; i < BINAURAL_CONVBANDS; i++ )
		{
		for ( j = 0; j < HRTF_LS_CHANNELS; j++ )
		{
		memcpy( ( hHRTF )->rightHRIRReal[i][j], hrtf_data_rptr, 7 sizeof( float ) );
		hrtf_data_rptr += 7 * sizeof( float );
		memcpy( ( hHRTF )->rightHRIRReal[i][j], hrtf_data_rptr, BINAURAL_NTAPS sizeof( float ) );
		hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float );
		}
		}
		for ( i = 0; i < BINAURAL_CONVBANDS; i++ )
		{
		for ( j = 0; j < HRTF_LS_CHANNELS; j++ )
		{
		memcpy( ( hHRTF )->rightHRIRImag[i][j], hrtf_data_rptr, 7 sizeof( float ) );
		hrtf_data_rptr += 7 * sizeof( float );
		memcpy( ( hHRTF )->rightHRIRImag[i][j], hrtf_data_rptr, BINAURAL_NTAPS sizeof( float ) );
		hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float );
		}
		}
		}
		@@ -977,7 +977,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata(
		}
		hrtf_data_rptr += sizeof( uint16_t );

		if ( 7 != ( (uint16_t ) ( hrtf_data_rptr ) ) )
		if ( BINAURAL_NTAPS != ( (uint16_t ) ( hrtf_data_rptr ) ) )
		{
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS)" );
		}
		@@ -987,32 +987,32 @@ static ivas_error create_fastconv_HRTF_from_rawdata(
		{
		for ( j = 0; j < HRTF_SH_CHANNELS; j++ )
		{
		memcpy( ( hHRTF )->leftHRIRReal_HOA3[i][j], hrtf_data_rptr, 7 sizeof( float ) );
		hrtf_data_rptr += 7 * sizeof( float );
		memcpy( ( hHRTF )->leftHRIRReal_HOA3[i][j], hrtf_data_rptr, BINAURAL_NTAPS sizeof( float ) );
		hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float );
		}
		}
		for ( i = 0; i < BINAURAL_CONVBANDS; i++ )
		{
		for ( j = 0; j < HRTF_SH_CHANNELS; j++ )
		{
		memcpy( ( hHRTF )->leftHRIRImag_HOA3[i][j], hrtf_data_rptr, 7 sizeof( float ) );
		hrtf_data_rptr += 7 * sizeof( float );
		memcpy( ( hHRTF )->leftHRIRImag_HOA3[i][j], hrtf_data_rptr, BINAURAL_NTAPS sizeof( float ) );
		hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float );
		}
		}
		for ( i = 0; i < BINAURAL_CONVBANDS; i++ )
		{
		for ( j = 0; j < HRTF_SH_CHANNELS; j++ )
		{
		memcpy( ( hHRTF )->rightHRIRReal_HOA3[i][j], hrtf_data_rptr, 7 sizeof( float ) );
		hrtf_data_rptr += 7 * sizeof( float );
		memcpy( ( hHRTF )->rightHRIRReal_HOA3[i][j], hrtf_data_rptr, BINAURAL_NTAPS sizeof( float ) );
		hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float );
		}
		}
		for ( i = 0; i < BINAURAL_CONVBANDS; i++ )
		{
		for ( j = 0; j < HRTF_SH_CHANNELS; j++ )
		{
		memcpy( ( hHRTF )->rightHRIRImag_HOA3[i][j], hrtf_data_rptr, 7 sizeof( float ) );
		hrtf_data_rptr += 7 * sizeof( float );
		memcpy( ( hHRTF )->rightHRIRImag_HOA3[i][j], hrtf_data_rptr, BINAURAL_NTAPS sizeof( float ) );
		hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float );
		}
		}
		}

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -812,7 +812,7 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG
		{
		latency_s = FASTCONV_HRIR_latency_s;
		hrtf_channels = HRTF_LS_CHANNELS;
		num_taps = 7;
		num_taps = BINAURAL_NTAPS;
		}
		else if ( rend_type == RENDERER_BINAURAL_FASTCONV_ROOM )
		{
		@@ -832,7 +832,7 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG

		latency_s = FASTCONV_HOA3_latency_s;
		hrtf_channels = HRTF_SH_CHANNELS;
		num_taps = 7;
		num_taps = BINAURAL_NTAPS;
		}
		else
		{