[cleanup] accept FIX_642 (9441545a) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -163,7 +163,6 @@



	#define FIX_642 /* FhG: Fix for issue 642, buggy DoA-array access in DirAC head rotation*/
	#define FIX_443_FD_CNG_INIT /* FhG: correct bitrate value for FD-CNG init */		#define FIX_443_FD_CNG_INIT /* FhG: correct bitrate value for FD-CNG init */
	#define VARIABLE_SPEED_DECODING /* FhG: Contribution 37: variable speed decoding employing the JBM functioniality */		#define VARIABLE_SPEED_DECODING /* FhG: Contribution 37: variable speed decoding employing the JBM functioniality */
	#define JBM_TSM_ON_TCS /* FhG: Contribution 37: run the TSM part of JBM on the TCs instead of the final output pcm waveforms */		#define JBM_TSM_ON_TCS /* FhG: Contribution 37: run the TSM part of JBM on the TCs instead of the final output pcm waveforms */

lib_dec/ivas_dirac_dec.c

+1 −30

Original line number	Original line	Diff line number	Diff line
	@@ -2812,28 +2812,6 @@ void ivas_dirac_dec_render_sf(
	#endif		#endif
	#ifdef JBM_TSM_ON_TCS		#ifdef JBM_TSM_ON_TCS
	/* Another workaround for self test BE */		/* Another workaround for self test BE */
	#ifndef FIX_642
	if ( st_ivas->hHeadTrackData && st_ivas->hDecoderConfig->voip_active == 0 )
	{
	QuatToRotMat( st_ivas->hHeadTrackData->Quaternions[st_ivas->hHeadTrackData->num_quaternions++], st_ivas->hHeadTrackData->Rmat );

	p_Rmat = &st_ivas->hHeadTrackData->Rmat[0][0];

	if ( st_ivas->hHeadTrackData->shd_rot_max_order == 0 )
	{
	num_freq_bands = hDirAC->band_grouping[hDirAC->hConfig->enc_param_start_band];
	for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots[subframe_idx]; slot_idx++ )
	{
	index_slot = slot_idx_start + slot_idx;
	rotateAziEle_DirAC( hDirAC->azimuth[index_slot], hDirAC->elevation[index_slot], num_freq_bands, hDirAC->num_freq_bands, p_Rmat );
	}
	}
	}
	else
	{
	p_Rmat = 0;
	}
	#endif

	/* copy parameters into local buffers*/		/* copy parameters into local buffers*/
	#ifdef FIX_393_459_460_SBA_MD		#ifdef FIX_393_459_460_SBA_MD
	@@ -2880,9 +2858,6 @@ void ivas_dirac_dec_render_sf(

	#ifdef JBM_TSM_ON_TCS		#ifdef JBM_TSM_ON_TCS
	if ( st_ivas->hHeadTrackData		if ( st_ivas->hHeadTrackData
	#ifndef FIX_642
	&& st_ivas->hDecoderConfig->voip_active == 1
	#endif
	)		)
	#else		#else
	if ( st_ivas->hHeadTrackData )		if ( st_ivas->hHeadTrackData )
	@@ -2919,11 +2894,7 @@ void ivas_dirac_dec_render_sf(
	#endif		#endif
	}		}
	}		}
	#if defined( JBM_TSM_ON_TCS ) & !defined( FIX_642 )
	else if ( !st_ivas->hHeadTrackData )
	#else
	else		else
	#endif
	{		{
	p_Rmat = 0;		p_Rmat = 0;
	}		}