formatting (09bff325) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -159,7 +159,6 @@
		#define FIX_1129_EXT_REND_OUTPUT_HIGH /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */
		#define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */
		#define FIX_1113_CLDFB_REND_IN_ISAR /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

		#define NONBE_1328_FIX_NON_LINEARITY /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0 */

		/* #################### End BASOP porting switches ############################ */

+2 −5

Original line number	Diff line number	Diff line
		@@ -1194,14 +1194,11 @@ ivas_error ivas_binRenderer_open(
		pRoomAcoustics,
		st_ivas->hDecoderConfig->output_Fs,
		st_ivas->hHrtfFastConv->fastconvReverberationTimes,
		st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections
		,
		NULL
		) ) != IVAS_ERR_OK )
		st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections,
		NULL ) ) != IVAS_ERR_OK )
		{
		return error;
		}

		}
		else
		{

+2 −6

Original line number	Diff line number	Diff line
		@@ -711,9 +711,7 @@ void ivas_ism_dec_digest_tc(

		if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC \|\|
		st_ivas->renderer_type == RENDERER_OSBA_AMBI \|\|
		st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV
		\|\| ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC )
		)
		st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\| ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC ) )
		{
		st_ivas->hIsmRendererData->interpolator[0] = 0.0f;
		for ( i = 1; i < interpolator_length; i++ )
		@@ -752,9 +750,7 @@ void ivas_ism_dec_digest_tc(

		if ( ( st_ivas->renderer_type == RENDERER_TD_PANNING \|\|
		st_ivas->renderer_type == RENDERER_OSBA_LS \|\|
		st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM
		\|\| ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC )
		) &&
		st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM \|\| ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC ) ) &&
		st_ivas->hCombinedOrientationData == NULL )
		{
		if ( st_ivas->hIntSetup.is_planar_setup )

+4 −8

Original line number	Diff line number	Diff line
		@@ -2215,10 +2215,8 @@ ivas_error IVAS_DEC_FeedRenderConfig(
		&( hRenderConfig->roomAcoustics ),
		hIvasDec->st_ivas->hDecoderConfig->output_Fs,
		NULL,
		NULL
		,
		NULL
		) ) != IVAS_ERR_OK )
		NULL,
		NULL ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -2235,10 +2233,8 @@ ivas_error IVAS_DEC_FeedRenderConfig(
		&( hRenderConfig->roomAcoustics ),
		hIvasDec->st_ivas->hDecoderConfig->output_Fs,
		NULL,
		NULL
		,
		NULL
		) ) != IVAS_ERR_OK )
		NULL,
		NULL ) ) != IVAS_ERR_OK )
		{
		return error;
		}

+5 −9

Original line number	Diff line number	Diff line
		@@ -243,10 +243,8 @@ ivas_error ivas_dirac_dec_init_binaural_data(
		pRoomAcoustics,
		output_Fs,
		( *phHrtfParambin )->parametricReverberationTimes,
		( *phHrtfParambin )->parametricReverberationEneCorrections
		,
		hDiracDecBin->earlyPartEneCorrection
		) ) != IVAS_ERR_OK )
		( *phHrtfParambin )->parametricReverberationEneCorrections,
		hDiracDecBin->earlyPartEneCorrection ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -2418,8 +2416,7 @@ static void getDirectPartGains(
		float Rmat[3][3],
		PARAMBIN_HRTF_GAIN_CACHE *gainCache,
		const int16_t isHeadtracked,
		HRTFS_PARAMBIN_HANDLE hHrtfParambin
		)
		HRTFS_PARAMBIN_HANDLE hHrtfParambin )
		{
		float aziRad, eleRad;
		float y, mappedX, aziRadMapped, A, A2, A3;
		@@ -2492,8 +2489,7 @@ static void hrtfShGetHrtf(
		float *rImagp,
		PARAMBIN_HRTF_GAIN_CACHE *gainCache,
		const int16_t useCachedValue,
		HRTFS_PARAMBIN_HANDLE hHrtfParambin
		)
		HRTFS_PARAMBIN_HANDLE hHrtfParambin )
		{
		int16_t k;
		float( *hrtfShCoeffsReInt )[16][60];