[cleanup] accept FIX_1720_HRTF_FASTCONV (04dba1cb) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -5414,7 +5414,6 @@ void ivas_binRenderer_close(
		BINAURAL_RENDERER_HANDLE hBinRenderer / i/o: decoder binaural renderer handle */
		);

		#ifdef FIX_1720_HRTF_FASTCONV
		void ivas_binaural_hrtf_close(
		HRTFS_FASTCONV_HANDLE hHrtfFastConv / i/o: decoder binaural hrtf handle */
		);
		@@ -5430,7 +5429,6 @@ ivas_error ivas_allocate_binaural_hrtf(
		RENDERER_TYPE renderer_type, /* i : renderer type */
		int16_t allocate_init_flag /* i : Memory allocation flag */
		);
		#endif

		#ifdef JBM_PARAMUPMIX
		void ivas_binaural_cldfb(

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,6 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */


		#define FIX_1720_HRTF_FASTCONV /* Dlb : Binaural and Binaural room format RAM saving in SBA mode */
		#define JBM_PARAMUPMIX /* Dlb: Issue 471: Integrate the Multichannel Parametric Upmix into the JBM path */
		#define FIX_194_LFE_DELAY_EXTREND /* FhG: Issue 194: Fix delay alignment of LFE in external renderer */
		#define FIX_582_INDEX_OUT_OF_BOUNDS_SNS_AVQ_DEC /* FhG: fix an undefined behaviour error in SNS AVQ decoding */

lib_dec/ivas_binRenderer_internal.c

+0 −60

Original line number	Diff line number	Diff line
		@@ -481,7 +481,6 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		return IVAS_ERR_OK;
		}

		#ifdef FIX_1720_HRTF_FASTCONV
		/-------------------------------------------------------------------------
		* ivas_init_binaural_hrtf()
		*
		@@ -719,7 +718,6 @@ ivas_error ivas_allocate_binaural_hrtf(
		}
		return IVAS_ERR_OK;
		}
		#endif

		/-------------------------------------------------------------------------
		* ivas_binaural_HRTF_open()
		@@ -729,11 +727,9 @@ ivas_error ivas_allocate_binaural_hrtf(

		static ivas_error ivas_binaural_hrtf_open(
		HRTFS_FASTCONV_HANDLE hHrtfFastConv / i : fastconv HRTF handle */
		#ifdef FIX_1720_HRTF_FASTCONV
		,
		AUDIO_CONFIG input_config, /* i : output configuration */
		RENDERER_TYPE renderer_type /* i : renderer type */
		#endif
		)
		{
		int16_t i, j;
		@@ -753,7 +749,6 @@ static ivas_error ivas_binaural_hrtf_open(
		}


		#ifdef FIX_1720_HRTF_FASTCONV
		ivas_init_binaural_hrtf( HrtfFastConv );
		if ( input_config == AUDIO_CONFIG_BINAURAL \|\| renderer_type == RENDERER_BINAURAL_FASTCONV )
		{
		@@ -777,17 +772,8 @@ static ivas_error ivas_binaural_hrtf_open(
		}
		HrtfFastConv->allocate_init_flag = 1;
		ivas_allocate_binaural_hrtf( HrtfFastConv, input_config, BINAURAL_INPUT_AUDIO_CONFIG_INVALID, renderer_type, HrtfFastConv->allocate_init_flag );
		#else
		HrtfFastConv->FASTCONV_HRIR_latency_s = FASTCONV_HRIR_latency_s;
		HrtfFastConv->FASTCONV_HOA3_latency_s = FASTCONV_HOA3_latency_s;
		HrtfFastConv->FASTCONV_HOA2_latency_s = FASTCONV_HOA2_latency_s;
		HrtfFastConv->FASTCONV_FOA_latency_s = FASTCONV_FOA_latency_s;
		HrtfFastConv->FASTCONV_BRIR_latency_s = FASTCONV_BRIR_latency_s;

		#endif
		for ( i = 0; i < BINAURAL_CONVBANDS; i++ )
		{
		#ifdef FIX_1720_HRTF_FASTCONV
		if ( renderer_type == RENDERER_BINAURAL_FASTCONV )
		{
		for ( j = 0; j < HRTF_LS_CHANNELS; j++ )
		@@ -838,42 +824,6 @@ static ivas_error ivas_binaural_hrtf_open(
		HrtfFastConv->rightHRIRImag_FOA[i][j] = rightHRIRImag_FOA[i][j];
		}
		}
		#else
		for ( j = 0; j < HRTF_LS_CHANNELS; j++ )
		{
		mvr2r( leftHRIRReal[i][j], HrtfFastConv->leftHRIRReal[i][j], BINAURAL_NTAPS );
		mvr2r( leftHRIRImag[i][j], HrtfFastConv->leftHRIRImag[i][j], BINAURAL_NTAPS );
		mvr2r( rightHRIRReal[i][j], HrtfFastConv->rightHRIRReal[i][j], BINAURAL_NTAPS );
		mvr2r( rightHRIRImag[i][j], HrtfFastConv->rightHRIRImag[i][j], BINAURAL_NTAPS );


		mvr2r( leftBRIRReal[i][j], HrtfFastConv->leftBRIRReal[i][j], BINAURAL_NTAPS_MAX );
		mvr2r( leftBRIRImag[i][j], HrtfFastConv->leftBRIRImag[i][j], BINAURAL_NTAPS_MAX );
		mvr2r( rightBRIRReal[i][j], HrtfFastConv->rightBRIRReal[i][j], BINAURAL_NTAPS_MAX );
		mvr2r( rightBRIRImag[i][j], HrtfFastConv->rightBRIRImag[i][j], BINAURAL_NTAPS_MAX );
		}
		for ( j = 0; j < HOA3_CHANNELS; j++ )
		{
		mvr2r( leftHRIRReal_HOA3[i][j], HrtfFastConv->leftHRIRReal_HOA3[i][j], BINAURAL_NTAPS_SBA );
		mvr2r( leftHRIRImag_HOA3[i][j], HrtfFastConv->leftHRIRImag_HOA3[i][j], BINAURAL_NTAPS_SBA );
		mvr2r( rightHRIRReal_HOA3[i][j], HrtfFastConv->rightHRIRReal_HOA3[i][j], BINAURAL_NTAPS_SBA );
		mvr2r( rightHRIRImag_HOA3[i][j], HrtfFastConv->rightHRIRImag_HOA3[i][j], BINAURAL_NTAPS_SBA );
		}
		for ( j = 0; j < HOA2_CHANNELS; j++ )
		{
		mvr2r( leftHRIRReal_HOA2[i][j], HrtfFastConv->leftHRIRReal_HOA2[i][j], BINAURAL_NTAPS_SBA );
		mvr2r( leftHRIRImag_HOA2[i][j], HrtfFastConv->leftHRIRImag_HOA2[i][j], BINAURAL_NTAPS_SBA );
		mvr2r( rightHRIRReal_HOA2[i][j], HrtfFastConv->rightHRIRReal_HOA2[i][j], BINAURAL_NTAPS_SBA );
		mvr2r( rightHRIRImag_HOA2[i][j], HrtfFastConv->rightHRIRImag_HOA2[i][j], BINAURAL_NTAPS_SBA );
		}
		for ( j = 0; j < FOA_CHANNELS; j++ )
		{
		mvr2r( leftHRIRReal_FOA[i][j], HrtfFastConv->leftHRIRReal_FOA[i][j], BINAURAL_NTAPS_SBA );
		mvr2r( leftHRIRImag_FOA[i][j], HrtfFastConv->leftHRIRImag_FOA[i][j], BINAURAL_NTAPS_SBA );
		mvr2r( rightHRIRReal_FOA[i][j], HrtfFastConv->rightHRIRReal_FOA[i][j], BINAURAL_NTAPS_SBA );
		mvr2r( rightHRIRImag_FOA[i][j], HrtfFastConv->rightHRIRImag_FOA[i][j], BINAURAL_NTAPS_SBA );
		}
		#endif
		}
		mvr2r( fastconvReverberationTimes, HrtfFastConv->fastconvReverberationTimes, CLDFB_NO_CHANNELS_MAX );
		mvr2r( fastconvReverberationEneCorrections, HrtfFastConv->fastconvReverberationEneCorrections, CLDFB_NO_CHANNELS_MAX );
		@@ -1073,11 +1023,7 @@ ivas_error ivas_rend_openCldfbRend(
		hBinRenderer->numPoses = 1;
		}
		/* Load HRTF tables */
		#ifdef FIX_1720_HRTF_FASTCONV
		ivas_binaural_hrtf_open( &pCldfbRend->hHrtfFastConv, hBinRenderer->hInputSetup->output_config, RENDERER_BINAURAL_FASTCONV );
		#else
		ivas_binaural_hrtf_open( &pCldfbRend->hHrtfFastConv );
		#endif


		/* Allocate memories and buffers needed for convolutional module */
		@@ -1179,11 +1125,7 @@ ivas_error ivas_binRenderer_open(
		}

		/* Load HRTF tables */
		#ifdef FIX_1720_HRTF_FASTCONV
		ivas_binaural_hrtf_open( &st_ivas->hHrtfFastConv, st_ivas->hIntSetup.output_config, st_ivas->renderer_type );
		#else
		ivas_binaural_hrtf_open( &st_ivas->hHrtfFastConv );
		#endif

		if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && ( st_ivas->hIntSetup.is_loudspeaker_setup == 0 ) )
		{
		@@ -1504,7 +1446,6 @@ void ivas_binRenderer_close(
		return;
		}

		#ifdef FIX_1720_HRTF_FASTCONV
		/*-------------------------------------------------------------------------
		* ivas_free_pppHrtfMem()
		*
		@@ -1573,7 +1514,6 @@ void ivas_binaural_hrtf_close(
		ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_FOA, FOA_CHANNELS, allocate_init_flag );
		ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_FOA, FOA_CHANNELS, allocate_init_flag );
		}
		#endif

		/-------------------------------------------------------------------------
		* ivas_binaural_add_LFE()

lib_dec/ivas_init_dec.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2718,10 +2718,8 @@ void ivas_destroy_dec(

		/* CRend binaural renderer handle */
		ivas_HRTF_CRend_binary_close( &st_ivas->hSetOfHRTF );
		#ifdef FIX_1720_HRTF_FASTCONV
		/* Fastconv HRTF memories */
		ivas_binaural_hrtf_close( &st_ivas->hHrtfFastConv );
		#endif
		/* Fastconv HRTF filters */
		ivas_HRTF_fastconv_binary_close( &st_ivas->hHrtfFastConv );

lib_rend/ivas_hrtf.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -36,9 +36,7 @@
		#include "ivas_prot_rend.h"
		#include "ivas_error.h"
		#include "wmc_auto.h"
		#ifdef FIX_1720_HRTF_FASTCONV
		#include "ivas_prot.h"
		#endif

		/-----------------------------------------------------------------------
		* ivas_HRTF_binary_open()
		@@ -142,9 +140,7 @@ ivas_error ivas_HRTF_fastconv_binary_open(
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FASTCONV HRTF tables!" );
		}
		#ifdef FIX_1720_HRTF_FASTCONV
		ivas_init_binaural_hrtf( *hHrtfFastConv );
		#endif
		return IVAS_ERR_OK;
		}