Merge branch 'main' into 1563_basop_PortFlpMR1475 (93ad73a9) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -161,13 +161,13 @@
		#define FIX_1043_JBM_MD_BUFFER /* VA: issue 1043: JBM MD handle allocation is avoided in non-JBM EXT operations */

		#define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */

		#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */

		#define FIX_1741_REVERB_TIMES_Q_FORMAT /* Philips: reverberation times in Q26 format instead of Q31 */
		#define FIX_1831_REVERB_REGRESSION /* Philips: fixes reverb regression issues */

		#define FIX_1835_REVERB_ACTIVATION /* FhG: Modified reverberation activation logic and corrected factEQ calculation */
		#define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST /* FhG: address issue 1037 */
		#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */

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

		#endif

+8 −0

Original line number	Diff line number	Diff line
		@@ -718,12 +718,20 @@ void decoder_LPD_fx(
		FOR( k = 0; k < 2; k++ )
		{

		#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
		/* Set pointer to parameters */
		prm = param + ( k * DEC_NPRM_DIV );

		/* Stability Factor */
		#endif
		IF( bfi == 0 )
		{
		#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
		/* Set pointer to parameters */
		prm = param + ( k * DEC_NPRM_DIV );

		/* Stability Factor */
		#endif
		st->stab_fac_fx = lsf_stab_fx( &lsf[( ( k + 1 ) ) * M], &lsf[k * M], 0, L_FRAME );
		move16();
		}

+21 −0

Original line number	Diff line number	Diff line
		@@ -4411,7 +4411,15 @@ void decoder_tcx_invQ_fx(

		tnsSize = 0;
		move16();
		#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
		prm_target = NULL; /* just to suppress MSVC warnigs */
		#else
		/* just to suppress MSVC warnigs */
		prm_target = NULL;
		prm_ltp = NULL;
		prm_tns = NULL;
		prm_sqQ = NULL;
		#endif

		/-----------------------------------------------------------------
		* Initializations
		@@ -4435,8 +4443,10 @@ void decoder_tcx_invQ_fx(
		move16();
		}

		#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
		prm_ltp = &prm[1 + NOISE_FILL_RANGES];
		prm_tns = prm_ltp + LTPSIZE;
		#endif

		gainCompensate = ONE_IN_Q14;
		move16();
		@@ -4452,6 +4462,10 @@ void decoder_tcx_invQ_fx(

		IF( !bfi )
		{
		#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
		prm_ltp = &prm[1 + NOISE_FILL_RANGES];
		prm_tns = prm_ltp + LTPSIZE;
		#endif
		index = prm[0];
		move16();

		@@ -4473,9 +4487,11 @@ void decoder_tcx_invQ_fx(
		move16();
		}

		#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
		prm_hm = prm_tns + tnsSize;
		prm_sqQ = prm_hm + NPRM_CTX_HM;
		*prm_sqQ1 = prm_sqQ;
		#endif

		/-----------------------------------------------------------
		* Spectrum data *
		@@ -4483,6 +4499,11 @@ void decoder_tcx_invQ_fx(

		IF( !bfi )
		{
		#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
		prm_hm = prm_tns + tnsSize;
		prm_sqQ = prm_hm + NPRM_CTX_HM;
		*prm_sqQ1 = prm_sqQ;
		#endif
		/-----------------------------------------------------------
		* Context HM *
		-----------------------------------------------------------/

+13 −0

Original line number	Diff line number	Diff line
		@@ -930,7 +930,20 @@ void concealment_decode_fix(
		/* sign randomization */
		FOR( i = 0; i < N; i++ )
		{
		#ifdef NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST
		Word16 rnd;
		rnd = own_random_fix( seed );
		IF( GE_16( rnd, 0 ) )
		{
		sign = 1;
		}
		ELSE IF( LT_16( rnd, 0 ) )
		{
		sign = -1;
		}
		#else
		sign = add( shl( shr( own_random_fix( seed ), 15 ), 1 ), 1 );
		#endif
		if ( EQ_16( sign, -1 ) )
		{
		invkoef[i] = L_negate( invkoef[i] );