Merge branch '3gpp_issue_696_fix_1' into 'main' (5c25362c) · Commits · SA4 / Audio / IVAS BASOP

lib_com/cnst.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -3008,6 +3008,8 @@ enum
		#define EVS_PI 3.14159265358979323846264338327950288f
		#define EVS_PI_FX 25736 /* pi in Q13 */
		#define EVS_2PI_FX 51472 /* 2 * pi in Q13 */
		#define EVS_PI_FX_Q27 421657428 /* pi in Q28 */
		#define EVS_2PI_FX_Q27 843314856 /* 2 * pi in Q28 */
		#define EVS_PI_BY_2_FX (Word16)(0x3244)
		//#define EVS_PI_FX (Word16)(0x6488)

lib_dec/ivas_stat_dec.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -159,7 +159,7 @@ typedef struct stereo_dft_dec_data_struct
		#ifndef IVAS_FLOAT_FIXED
		float gipd[STEREO_DFT_DEC_DFT_NB];
		#else
		Word32 gipd_fx[STEREO_DFT_DEC_DFT_NB]; /* Q13 */
		Word32 gipd_fx[STEREO_DFT_DEC_DFT_NB]; /* Q27 */
		#endif
		int16_t no_ipd_flag; /* flag to indicate when no IPD gets used */

		@@ -197,9 +197,9 @@ typedef struct stereo_dft_dec_data_struct
		Word32 itd_xfade_target_fx; /* Q15 */
		Word32 itd_xfade_prev_fx; /* Q15 */

		Word32 ipd_xfade_target_fx; /* Q13 */
		Word32 ipd_xfade_step_fx; /* Q13 */
		Word32 ipd_xfade_prev_fx; /* Q13 */
		Word32 ipd_xfade_target_fx; /* Q27 */
		Word32 ipd_xfade_step_fx; /* Q27 */
		Word32 ipd_xfade_prev_fx; /* Q27 */
		Word32 res_pred_gain_fx[STEREO_DFT_DEC_DFT_NB * STEREO_DFT_BAND_MAX]; /* prediction gain for the residual HFs / / Q31 */
		#endif
		int16_t res_pred_band_min; /* Band min for prediction of residual */

lib_dec/ivas_stereo_dft_dec_fx.c

+40 −38

Original line number	Diff line number	Diff line
		@@ -838,14 +838,14 @@ void stereo_dft_dec_smooth_parameters_fx(
		#endif
		{
		Word16 q_val;
		IF( GT_32( L_sub( hStereoDft->gipd_fx[add( k, k_offset )], hStereoDft->ipd_xfade_prev_fx ), EVS_PI_FX ) )
		IF( GT_32( L_sub( hStereoDft->gipd_fx[add( k, k_offset )], hStereoDft->ipd_xfade_prev_fx ), EVS_PI_FX_Q27 ) )
		{
		hStereoDft->ipd_xfade_target_fx = L_sub( hStereoDft->gipd_fx[add( k, k_offset )], EVS_PI_FX );
		hStereoDft->ipd_xfade_target_fx = L_sub( hStereoDft->gipd_fx[add( k, k_offset )], EVS_PI_FX_Q27 );
		move32();
		hStereoDft->ipd_xfade_step_fx = BASOP_Util_Divide3232_Scale( L_sub( hStereoDft->ipd_xfade_target_fx, hStereoDft->ipd_xfade_prev_fx ), L_shl( L_sub( STEREO_DFT_ITD_CNG_XFADE, hStereoDft->ipd_xfade_counter ), Q13 ), &q_val );
		q_val = sub( q_val, Q2 );
		hStereoDft->ipd_xfade_step_fx = BASOP_Util_Divide3232_Scale( L_sub( hStereoDft->ipd_xfade_target_fx, hStereoDft->ipd_xfade_prev_fx ), L_shl( L_sub( STEREO_DFT_ITD_CNG_XFADE, hStereoDft->ipd_xfade_counter ), Q24 ), &q_val );
		q_val = add( q_val, Q9 ); /* Q27 - (Q15 - q_val + (-3))*/
		move32();
		IF( GT_16( q_val, 16 ) )
		IF( GT_16( q_val, 32 ) )
		{
		assert( 0 );
		}
		@@ -854,14 +854,14 @@ void stereo_dft_dec_smooth_parameters_fx(
		hStereoDft->ipd_xfade_step_fx = L_shl( hStereoDft->ipd_xfade_step_fx, q_val );
		}
		}
		ELSE IF( GT_32( L_sub( hStereoDft->ipd_xfade_prev_fx, hStereoDft->gipd_fx[add( k, k_offset )] ), EVS_PI_FX ) )
		ELSE IF( GT_32( L_sub( hStereoDft->ipd_xfade_prev_fx, hStereoDft->gipd_fx[add( k, k_offset )] ), EVS_PI_FX_Q27 ) )
		{
		hStereoDft->ipd_xfade_target_fx = L_add( hStereoDft->gipd_fx[add( k, k_offset )], L_shl( EVS_PI_FX, 1 ) );
		hStereoDft->ipd_xfade_target_fx = L_add( hStereoDft->gipd_fx[add( k, k_offset )], L_shl( EVS_PI_FX_Q27, 1 ) );
		move32();
		hStereoDft->ipd_xfade_step_fx = BASOP_Util_Divide3232_Scale( L_sub( hStereoDft->ipd_xfade_target_fx, hStereoDft->ipd_xfade_prev_fx ), L_shl( L_sub( STEREO_DFT_ITD_CNG_XFADE, hStereoDft->ipd_xfade_counter ), Q13 ), &q_val );
		q_val = sub( q_val, Q2 );
		hStereoDft->ipd_xfade_step_fx = BASOP_Util_Divide3232_Scale( L_sub( hStereoDft->ipd_xfade_target_fx, hStereoDft->ipd_xfade_prev_fx ), L_shl( L_sub( STEREO_DFT_ITD_CNG_XFADE, hStereoDft->ipd_xfade_counter ), Q24 ), &q_val );
		q_val = add( q_val, Q9 ); /* Q27 - (Q15 - q_val + (-3))*/
		move32();
		IF( GT_16( q_val, 16 ) )
		IF( GT_16( q_val, 32 ) )
		{
		assert( 0 );
		}
		@@ -874,10 +874,10 @@ void stereo_dft_dec_smooth_parameters_fx(
		{
		hStereoDft->ipd_xfade_target_fx = hStereoDft->gipd_fx[add( k, k_offset )];
		move32();
		hStereoDft->ipd_xfade_step_fx = BASOP_Util_Divide3232_Scale( L_sub( hStereoDft->ipd_xfade_target_fx, hStereoDft->ipd_xfade_prev_fx ), L_shl( L_sub( STEREO_DFT_ITD_CNG_XFADE, hStereoDft->ipd_xfade_counter ), Q13 ), &q_val );
		q_val = sub( q_val, Q2 );
		hStereoDft->ipd_xfade_step_fx = BASOP_Util_Divide3232_Scale( L_sub( hStereoDft->ipd_xfade_target_fx, hStereoDft->ipd_xfade_prev_fx ), L_shl( L_sub( STEREO_DFT_ITD_CNG_XFADE, hStereoDft->ipd_xfade_counter ), Q24 ), &q_val );
		q_val = add( q_val, Q9 ); /* Q27 - (Q15 - q_val + (-3))*/
		move32();
		IF( GT_16( q_val, 16 ) )
		IF( GT_16( q_val, 32 ) )
		{
		assert( 0 );
		}
		@@ -1135,13 +1135,13 @@ void stereo_dft_dec_smooth_parameters_fx(
		/* Smoothing of IPDs*/
		pgIpd = hStereoDft->gipd_fx + ( add( k, k_offset ) );
		diff_ipd = L_sub( pgIpd[0], pgIpd[-hStereoDft->prm_res[add( k, k_offset )]] );
		IF( LT_32( diff_ipd, -EVS_PI_FX ) )
		IF( LT_32( diff_ipd, -EVS_PI_FX_Q27 ) )
		{
		pgIpd[0] = L_add( L_add( pgIpd[0], EVS_PI_FX ), EVS_PI_FX );
		pgIpd[0] = L_add( pgIpd[0], EVS_2PI_FX_Q27 );
		}
		ELSE IF( GT_32( diff_ipd, EVS_PI_FX ) )
		ELSE IF( GT_32( diff_ipd, EVS_PI_FX_Q27 ) )
		{
		pgIpd[0] = L_sub( L_sub( pgIpd[0], EVS_PI_FX ), EVS_PI_FX );
		pgIpd[0] = L_sub( pgIpd[0], EVS_2PI_FX_Q27 );
		}

		IF( !hStereoDft->attackPresent )
		@@ -1637,23 +1637,23 @@ void stereo_dft_dec_fx(
		IF( NE_32( pgIpd[0], 0 ) )
		{
		Word32 theta = pgIpd[0];
		WHILE( GT_32( theta, EVS_2PI_FX ) )
		WHILE( GT_32( theta, EVS_2PI_FX_Q27 ) )
		{
		theta = L_sub( theta, EVS_2PI_FX );
		theta = L_sub( theta, EVS_2PI_FX_Q27 );
		}
		WHILE( LT_32( theta, -EVS_2PI_FX ) )
		WHILE( LT_32( theta, -EVS_2PI_FX_Q27 ) )
		{
		theta = L_add( theta, EVS_2PI_FX );
		theta = L_add( theta, EVS_2PI_FX_Q27 );
		}
		IF( GT_32( theta, EVS_PI_FX ) )
		IF( GT_32( theta, EVS_PI_FX_Q27 ) )
		{
		theta = L_sub( theta, EVS_2PI_FX );
		theta = L_sub( theta, EVS_2PI_FX_Q27 );
		}
		ELSE IF( LT_32( theta, -EVS_PI_FX ) )
		ELSE IF( LT_32( theta, -EVS_PI_FX_Q27 ) )
		{
		theta = L_add( theta, EVS_2PI_FX );
		theta = L_add( theta, EVS_2PI_FX_Q27 );
		}
		c0 = getCosWord16( extract_l( theta ) );
		c0 = getCosWord16( (Word16) L_shr( theta, 14 ) );
		IF( EQ_16( c0, ONE_IN_Q14 ) )
		{
		c0 = MAX_16;
		@@ -1662,7 +1662,7 @@ void stereo_dft_dec_fx(
		{
		c0 = shl( c0, 1 );
		}
		s0 = getSinWord16( extract_l( theta ) );
		s0 = getSinWord16( (Word16) L_shr( theta, 14 ) );
		FOR( i = hStereoDft->band_limits[b]; i < hStereoDft->band_limits[b + 1]; i++ )
		{
		/rotate L/
		@@ -1902,23 +1902,23 @@ void stereo_dft_dec_fx(
		IF( NE_32( pgIpd[0], 0 ) )
		{
		Word32 theta = pgIpd[0];
		WHILE( GT_32( theta, EVS_2PI_FX ) )
		WHILE( GT_32( theta, EVS_2PI_FX_Q27 ) )
		{
		theta = L_sub( theta, EVS_2PI_FX );
		theta = L_sub( theta, EVS_2PI_FX_Q27 );
		}
		WHILE( LT_32( theta, -EVS_2PI_FX ) )
		WHILE( LT_32( theta, -EVS_2PI_FX_Q27 ) )
		{
		theta = L_add( theta, EVS_2PI_FX );
		theta = L_add( theta, EVS_2PI_FX_Q27 );
		}
		IF( GT_32( theta, EVS_PI_FX ) )
		IF( GT_32( theta, EVS_PI_FX_Q27 ) )
		{
		theta = L_sub( theta, EVS_2PI_FX );
		theta = L_sub( theta, EVS_2PI_FX_Q27 );
		}
		ELSE IF( LT_32( theta, -EVS_PI_FX ) )
		ELSE IF( LT_32( theta, -EVS_PI_FX_Q27 ) )
		{
		theta = L_add( theta, EVS_2PI_FX );
		theta = L_add( theta, EVS_2PI_FX_Q27 );
		}
		c0 = getCosWord16( extract_l( theta ) );
		c0 = getCosWord16( (Word16) L_shr( theta, 14 ) );
		IF( EQ_16( c0, ONE_IN_Q14 ) )
		{
		c0 = MAX_16;
		@@ -1927,7 +1927,7 @@ void stereo_dft_dec_fx(
		{
		c0 = shl( c0, 1 );
		}
		s0 = getSinWord16( extract_l( theta ) );
		s0 = getSinWord16( (Word16) L_shr( theta, 14 ) );
		FOR( i = hStereoDft->band_limits[b]; i < hStereoDft->band_limits[b + 1]; i++ )
		{
		/rotate L/
		@@ -2335,6 +2335,7 @@ static void stereo_dft_dequantize_ipd_fx(
		{
		Word16 i;
		Word16 delta_fx;
		Word32 temp_out;
		IF( EQ_16( bits, 2 ) ) /* 2-bit phase quantization for the highest frequency band only */
		{
		delta_fx = ( EVS_PI_FX ) >> 1;
		@@ -2355,7 +2356,8 @@ static void stereo_dft_dequantize_ipd_fx(

		FOR( i = 0; i < N; i++ )
		{
		*out_fx = L_sub( L_mult0( ind[i], delta_fx ), ( EVS_PI_FX ) );
		temp_out = L_sub( L_mult0( ind[i], delta_fx ), ( EVS_PI_FX ) );
		*out_fx = L_shl( temp_out, 14 );
		}
		return;
		}