merge main (d5ad6b97) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -2998,10 +2998,11 @@ void acelp_fast_fx(
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
		const Word16 cdk_index, /* i : codebook index */
		const Word16 dn_orig[L_SUBFR],
		/* i : corr. between target and h[]. */ // Q_new + 1
		/* i : corr. between target and h[]. */ // Q_dn
		Word16 Q_dn,
		const Word16 cn[L_SUBFR],
		/* i : residual after long term prediction */ // Q_new + 1
		/* i : residual after long term prediction */ // q_cn
		const Word16 q_cn,
		const Word16 H[L_SUBFR],
		/* i : impulse response of weighted synthesis filter */ // e(norm_s(H[0])+1)
		Word16 code[L_SUBFR], /* o : algebraic (fixed) codebook excitation */

lib_com/ivas_spar_com_fx.c

+75 −110

Original line number	Diff line number	Diff line
		@@ -51,24 +51,16 @@
		* Local constants
		------------------------------------------------------------------------------------------/

		#define IVAS_FLT_EPS ( 1e-10F )
		#define IVAS_FIX_EPS ( 1 )
		#define IVAS_DBL_EPS ( (double) 1e-20 )
		#define IVAS_FIX_EPS_Q40 ( 110 )

		#define IVAS_REMIX_MULT_FAC ( 0.5f )

		#define IVAS_ACTIVEW_DM_F ( 1.0f )
		#define IVAS_ACTIVEW_DM_F_Q30 ( ONE_IN_Q30 ) /1 Q30/
		#define IVAS_ACTIVEW_DM_F_DTX ( 0.25f )
		#define IVAS_ACTIVEW_DM_F_DTX_Q30 ( 268435456 ) /0.25 Q30/
		#define IVAS_ACTIVEW_DM_F_VLBR ( 0.25f )
		#define IVAS_ACTIVEW_DM_F_VLBR_Q30 ( 268435456 ) /0.25 Q30/
		#define IVAS_LIN_ACTIVEW_QUAD_ACTIVEW_THRESH ( 3.0f )
		#define IVAS_LIN_ACTIVEW_QUAD_ACTIVEW_THRESH_Q29 ( 1610612736 ) /3 Q29/

		#define IVAS_P_NORM_SCALING ( 1.0f )
		#define IVAS_P_NORM_SCALING_FX ( ONE_IN_Q31 ) // 1 Q31
		#define IVAS_P_NORM_SCALING_DTX ( 0.75f )
		#define IVAS_P_NORM_SCALING_DTX_FX ( 1610612736 ) // 0.75 Q31

		#define IVAS_MAT_DIM_3 ( 3 )
		@@ -1626,8 +1618,18 @@ static void ivas_get_Wscaling_factor_enc_fx(
		ivas_calc_post_pred_per_band_enc_fx( cov_real, q_cov_real, mixer_mat, q_mixer_mat, num_ch, b, postpred_cov_re, &q_postpred_cov_re );
		}

		Gw_sq = BASOP_Util_Divide3232_Scale( cov_real[0][0][b], L_max( postpred_cov_re[0][0], IVAS_FIX_EPS ), &tmp_exp ); // 15-(tmp_exp-(q_cov_real[0][0][b]- q_postpred_cov_re))
		tmp = L_shl_sat( IVAS_FIX_EPS_Q40, sub( q_postpred_cov_re, 40 ) );

		IF( LE_32( postpred_cov_re[0][0], tmp ) )
		{
		Gw_sq = Mpy_32_32( cov_real[0][0][b], 1250000000 ); /1/1e-10 = 1250000000 Q(-4)/
		q_Gw_sq = add( q_cov_real[0][0][b], -4 - 31 );
		}
		ELSE
		{
		Gw_sq = BASOP_Util_Divide3232_Scale( cov_real[0][0][b], postpred_cov_re[0][0], &tmp_exp ); // 15-(tmp_exp-(q_cov_real[0][0][b]- q_postpred_cov_re))
		q_Gw_sq = add( sub( 15, tmp_exp ), sub( q_cov_real[0][0][b], q_postpred_cov_re ) );
		}

		shift = MAX16B;
		move16();
		@@ -1992,12 +1994,15 @@ static void ivas_calc_post_pred_per_band_enc_fx(
		Word32 postpred_cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], /q_postpred_cov_re/
		Word16 *q_postpred_cov_re )
		{
		Word16 i, j, k, guard_bits, tmp, q_temp_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], q_tmp_re, q_W_tmp;
		Word16 i, j, k;
		Word32 dmx_mat_conj[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
		Word32 temp_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
		Word32 max_val;
		Word64 tmp_re, W_tmp;
		Word16 q_postpred_cov_re_per_value[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
		Word16 temp_mat_e[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
		Word16 q_postpred_cov_re_buf[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
		Word16 min_val;
		Word32 tmp_re;
		Word16 tmp_q;
		Word16 tmp_e;

		FOR( i = 0; i < num_ch; i++ )
		{
		@@ -2014,135 +2019,71 @@ static void ivas_calc_post_pred_per_band_enc_fx(
		set32_fx( postpred_cov_re[i], 0, num_ch );
		}

		max_val = 1;
		move32();
		min_val = MAX16B;
		move16();
		/* num_ch x num_ch mult */
		FOR( i = 0; i < num_ch; i++ )
		{
		FOR( j = 0; j < num_ch; j++ )
		{
		tmp_re = 0;
		move64();
		q_tmp_re = 31;
		temp_mat[i][j] = 0;
		move32();
		temp_mat_e[i][j] = 0;
		move16();
		FOR( k = 0; k < num_ch; k++ )
		{
		W_tmp = W_shr( W_mult0_32_32( cov_real[i][k][band_idx], dmx_mat_conj[k][j] ), q_mixer_mat ); /q_cov_real[i][k][band_idx]/
		IF( LT_16( q_cov_real[i][k][band_idx], q_tmp_re ) )
		{
		tmp_re = W_add( W_shr( tmp_re, sub( q_tmp_re, q_cov_real[i][k][band_idx] ) ), W_tmp ); /q_cov_real[i][k][band_idx]/
		q_tmp_re = q_cov_real[i][k][band_idx];
		move16();
		}
		ELSE
		{
		tmp_re = W_add( tmp_re, W_shr( W_tmp, sub( q_cov_real[i][k][band_idx], q_tmp_re ) ) ); /q_tmp_re/
		}
		}
		IF( tmp_re == 0 )
		tmp_re = Mpy_32_32( cov_real[i][k][band_idx], dmx_mat_conj[k][j] );
		tmp_e = sub( 62, add( q_cov_real[i][k][band_idx], q_mixer_mat ) );
		IF( tmp_re )
		{
		q_temp_mat[i][j] = 31;
		move16();
		temp_mat[i][j] = 0;
		temp_mat[i][j] = BASOP_Util_Add_Mant32Exp( temp_mat[i][j], temp_mat_e[i][j], tmp_re, tmp_e, &temp_mat_e[i][j] );
		move32();
		}
		ELSE
		{
		q_temp_mat[i][j] = q_tmp_re;
		move16();
		q_tmp_re = W_norm( tmp_re );
		temp_mat[i][j] = W_extract_h( W_shl( tmp_re, q_tmp_re ) ); /q_temp_mat[i][j]+ q_tmp_re -32/
		move32();
		q_temp_mat[i][j] = sub( add( q_temp_mat[i][j], q_tmp_re ), 32 );
		move16();
		}
		max_val = L_max( max_val, L_abs( temp_mat[i][j] ) );
		}
		}

		guard_bits = find_guarded_bits_fx( num_ch );

		tmp = norm_l( max_val );
		IF( LT_16( tmp, guard_bits ) )
		{
		guard_bits = sub( guard_bits, tmp );
		}
		ELSE
		{
		guard_bits = 0;
		move16();
		}

		*q_postpred_cov_re = 31;
		move16();
		/* num_ch x num_ch mult */
		FOR( i = 0; i < num_ch; i++ )
		{
		FOR( j = i; j < num_ch; j++ )
		{
		tmp_re = 0;
		move64();
		q_tmp_re = 31;
		q_postpred_cov_re_buf[i][j] = *q_postpred_cov_re;
		move16();
		FOR( k = 0; k < num_ch; k++ )
		{
		W_tmp = W_shr( W_mult0_32_32( mixer_mat[i][k][band_idx], temp_mat[k][j] ), guard_bits ); // q_temp_mat[k][j]+ q_mixer_mat-guard_bits
		q_W_tmp = sub( add( q_temp_mat[k][j], q_mixer_mat ), guard_bits );
		IF( LT_16( q_W_tmp, q_tmp_re ) )
		tmp_re = Mpy_32_32( mixer_mat[i][k][band_idx], temp_mat[k][j] );
		tmp_q = sub( q_mixer_mat, temp_mat_e[k][j] );
		IF( tmp_re )
		{
		tmp_re = W_add( W_shr( tmp_re, sub( q_tmp_re, q_W_tmp ) ), W_tmp ); // q_W_tmp
		q_tmp_re = q_W_tmp;
		tmp_e = sub( 31, q_postpred_cov_re_buf[i][j] );
		postpred_cov_re[i][j] = BASOP_Util_Add_Mant32Exp( postpred_cov_re[i][j], tmp_e, tmp_re, sub( Q31, tmp_q ), &tmp_e );
		move32();
		q_postpred_cov_re_buf[i][j] = sub( 31, tmp_e );
		move16();
		}
		ELSE
		{
		tmp_re = W_add( tmp_re, W_shr( W_tmp, sub( q_W_tmp, q_tmp_re ) ) ); // q_tmp_re
		}
		}

		if ( LT_64( W_abs( tmp_re ), L_shl( IVAS_FIX_EPS, guard_bits ) ) )
		{
		tmp_re = 0;
		move64();
		}

		q_postpred_cov_re_per_value[i][j] = q_tmp_re;
		move16();
		IF( tmp_re == 0 )
		{
		postpred_cov_re[i][j] = W_extract_l( tmp_re ); /* q_tmp_re*/
		move32();
		}
		ELSE
		IF( postpred_cov_re[i][j] )
		{
		q_tmp_re = W_norm( tmp_re );
		postpred_cov_re[i][j] = W_extract_h( W_shl( tmp_re, q_tmp_re ) ); /* q_tmp_re+ q_postpred_cov_re_per_value[i][j] -32*/
		move32();
		q_postpred_cov_re_per_value[i][j] = sub( add( q_tmp_re, q_postpred_cov_re_per_value[i][j] ), 32 );
		move16();
		min_val = s_min( min_val, q_postpred_cov_re_buf[i][j] );
		}
		q_postpred_cov_re = s_min( q_postpred_cov_re, q_postpred_cov_re_per_value[i][j] );
		move16();
		}
		}

		/Changing Q of postpred_cov_re to min_val/
		FOR( i = 0; i < num_ch; i++ )
		{
		FOR( j = i; j < num_ch; j++ )
		{
		IF( postpred_cov_re[i][j] >= 0 )
		IF( postpred_cov_re[i][j] )
		{
		postpred_cov_re[i][j] = L_shr( postpred_cov_re[i][j], sub( q_postpred_cov_re_per_value[i][j], q_postpred_cov_re ) ); //q_postpred_cov_re
		move32();
		}
		ELSE
		{
		postpred_cov_re[i][j] = L_negate( L_shr( L_negate( postpred_cov_re[i][j] ), sub( q_postpred_cov_re_per_value[i][j], q_postpred_cov_re ) ) ); //q_postpred_cov_re
		postpred_cov_re[i][j] = L_shl( postpred_cov_re[i][j], sub( min_val, q_postpred_cov_re_buf[i][j] ) );
		move32();
		}
		}
		}


		FOR( i = 0; i < num_ch; i++ )
		{
		FOR( j = 0; j < i; j++ )
		@@ -2152,6 +2093,14 @@ static void ivas_calc_post_pred_per_band_enc_fx(
		}
		}

		if ( EQ_16( min_val, MAX16B ) )
		{
		min_val = Q31;
		move16();
		}
		*q_postpred_cov_re = min_val;
		move16();

		return;
		}

		@@ -2687,7 +2636,8 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		trace = W_add( trace, W_deposit32_l( L_abs( cov_uu_re[i - num_dmx][i - num_dmx] ) ) ); // q_cov_uu_re
		}

		factor = L_max( IVAS_FIX_EPS, postpred_cov_re[0][0] ); // q_postpred_cov_re
		factor = postpred_cov_re[0][0]; // q_postpred_cov_re
		move32();
		q_factor = q_postpred_cov_re;
		move16();
		IF( trace != 0 )
		@@ -2708,10 +2658,22 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		factor = L_max( factor, tmp ); // q_factor
		}

		tmp = L_shl_sat( 189 /* 1e-20 in Q74 */, sub( q_factor, 74 ) );

		Word16 factor_exp = 0;
		move16();
		IF( LE_32( factor, tmp ) )
		{
		factor = 22204; // (1 / 1e-20) in Q(-52)
		factor_exp = Q15 - ( -52 );
		move32();
		move16();
		}
		ELSE
		{
		factor = BASOP_Util_Divide3232_Scale( 1, factor, &factor_exp ); // q=15-(factor_exp+31-(31-q_factor))
		factor_exp = add( factor_exp, q_factor );
		}

		/* normalise Hermitian (except for rounding) cov_uu */
		FOR( i = num_dmx; i < num_ch; i++ )
		@@ -2728,7 +2690,7 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		{
		q_tmp = W_norm( W_tmp );
		}
		cov_uu_re[i - num_dmx][j - num_dmx] = W_extract_h( W_shl( W_mult0_32_32( cov_uu_re[i - num_dmx][j - num_dmx], factor ), q_tmp ) ); /q_cov_uu_re+15-factor_exp+q_tmp-32/
		cov_uu_re[i - num_dmx][j - num_dmx] = W_extract_h( W_shl( W_tmp, q_tmp ) ); /q_cov_uu_re+15-factor_exp+q_tmp-32/
		move32();
		q_cov_uu_re_per_value[i - num_dmx][j - num_dmx] = sub( add( add( q_cov_uu_re, sub( 15, factor_exp ) ), q_tmp ), 32 );
		move16();
		@@ -3311,6 +3273,9 @@ void ivas_calc_c_p_coeffs_enc_fx(
		Word16 i, j, q_postpred_cov_re;
		Word32 postpred_cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];

		q_postpred_cov_re = 0;
		move16();

		FOR( i = 0; i < IVAS_SPAR_MAX_CH; i++ )
		{
		set_zero_fx( postpred_cov_re[i], IVAS_SPAR_MAX_CH );

lib_com/options.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -67,6 +67,8 @@
		#define BASOP_NOGLOB_DECLARE_LOCAL
		#endif

		#define FIX_1378_ACELP_OUT_OF_BOUNDS

		/* Note: each compile switch (FIX_1101_...) is independent from the other ones */
		//#define OPT_STEREO_32KBPS_V1 /* Optimization made in stereo decoding path for 32kbps decoding */
		#define OPT_AVOID_STATE_BUF_RESCALE /* Optimization made to avoid rescale of synth state buffer */
		@@ -82,10 +84,10 @@
		//#define FORCE_GENERIC
		//#define ALLOW_TM /* To allow some transition mode */

		#define REMOVE_A_SCALE
		//#define REMOVE_A_SCALE


		#if 1 // diminish MLD by ~1 on NO_S
		#if 0 // diminish MLD by ~1 on NO_S


		#define USE_EVS_FUNC_LP // -> BE for IVAS, but condition seems missing compared to float for rf condition

lib_com/prot_fx.h

+1 −8

Original line number	Diff line number	Diff line
		@@ -5077,14 +5077,7 @@ void fine_gain_quant_fx(
		Word16 fg_pred, / i/o: Predicted gains / Corrected gains Q12 */
		const Word16 gopt / i : Optimal gains Q12 */
		);
		void fine_gain_quant_ivas_fx(
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
		const Word16 ord, / i : Indices for energy order Q0 */
		const Word16 num_sfm, /* i : Number of bands Q0 */
		const Word16 gain_bits, / i : Gain adjustment bits per sub band Q0 */
		Word16 fg_pred, / i/o: Predicted gains / Corrected gains i:Q12 / o:Q11 */
		const Word16 gopt / i : Optimal gains Q12 */
		);

		void get_max_pulses_fx(
		const Word16 band_start, / i : Sub band start indices */
		const Word16 band_end, / i : Sub band end indices */

lib_com/pvq_com_fx.c

+0 −67

Original line number	Diff line number	Diff line
		@@ -509,73 +509,6 @@ void apply_gain_fx(
		*
		* Fine gain quantization
		--------------------------------------------------------------------------/
		void fine_gain_quant_ivas_fx(
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
		const Word16 ord, / i : Indices for energy order Q0 */
		const Word16 num_sfm, /* i : Number of bands Q0 */
		const Word16 gain_bits, / i : Gain adjustment bits per sub band Q0 */
		Word16 fg_pred, / i/o: Predicted gains / Corrected gains i:Q12 / o:Q11 */
		const Word16 gopt / i : Optimal gains Q12 */
		)
		{
		Word16 band;
		Word16 gbits;
		Word16 idx;
		Word16 gain_db, gain_dbq;
		Word16 err;

		Word16 tmp1, tmp2, exp1, exp2;
		Word32 L_tmp;
		UWord16 lsb;
		#ifdef BASOP_NOGLOB_DECLARE_LOCAL
		Flag Overflow = 0;
		move32();
		#endif

		FOR( band = 0; band < num_sfm; band++ )
		{
		gbits = gain_bits[ord[band]]; /* Q0 */
		move16();
		test();
		IF( fg_pred[band] != 0 && gbits > 0 )
		{
		exp1 = norm_s( gopt[band] );
		exp1 = sub( exp1, 1 );
		tmp1 = shl( gopt[band], exp1 );
		exp2 = norm_s( fg_pred[band] );
		tmp2 = shl( fg_pred[band], exp2 ); /* Q12 + exp2 */
		exp1 = add( 15, sub( exp1, exp2 ) );
		err = div_s( tmp1, tmp2 ); /* Q15 */
		tmp1 = norm_s( err );
		exp2 = Log2_norm_lc( L_deposit_h( shl( err, tmp1 ) ) );
		tmp1 = sub( 14, tmp1 );
		tmp1 = sub( tmp1, exp1 );
		L_tmp = L_Comp( tmp1, exp2 );
		Mpy_32_16_ss( L_tmp, 24660, &L_tmp, &lsb ); /* 24660 = 20log10(2) in Q12 / /16+12-15=13 /
		gain_db = round_fx_sat( L_shl_o( L_tmp, 17, &Overflow ) ); /* Q14 */

		idx = squant_fx( gain_db, &gain_dbq, finegain_fx[gbits - 1], gain_cb_size[gbits - 1] ); /* Q0 */
		push_indice( hBstr, IND_PVQ_FINE_GAIN, idx, gbits );

		L_tmp = L_mult0( gain_dbq, 21771 ); /* 21771=0.05log2(10) / /* 14+17=31 */
		L_tmp = L_shr( L_tmp, 15 ); /* Q16 */
		tmp1 = L_Extract_lc( L_tmp, &exp1 );
		tmp1 = abs_s( tmp1 );
		tmp1 = extract_l( Pow2( 14, tmp1 ) );
		exp1 = sub( 14, exp1 );

		L_tmp = L_mult0( fg_pred[band], tmp1 ); /12+exp1 /
		fg_pred[band] = round_fx( L_shl( L_tmp, sub( 15, exp1 ) ) ); /12+exp1+16-exp1-16=12 - 1-> Q11/
		move16();
		}
		ELSE
		{
		fg_pred[band] = shr( fg_pred[band], 1 ); // Q12 -> Q11 To align all the fg_pred indices in same Q.
		}
		}

		return;
		}
		void fine_gain_quant_fx(
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
		const Word16 ord, / i : Indices for energy order Q0 */