LTV test for SBA enc BE changes - 16062025 (0a99c033) · Commits · SA4 / Audio / IVAS BASOP

lib_com/interpol_fx.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -70,9 +70,14 @@ Word32 Interpol_lc_fx( /* o : interpolated value
		c2 += up_samp; /* move16() not needed, since the coefficient can be rearrange in bit exact way */
		c1 += up_samp;
		}
		#ifdef OPT_SBA_ENC_V2_BE
		L_sum = W_shl_sat_l( L_sum64, 1 ); /Q15/
		}
		#else
		L_sum = W_sat_l( L_sum64 ); /Q14/
		}
		L_sum = L_shl_sat( L_sum, 1 ); /Q15/
		#endif
		return L_sum;
		}

lib_com/ivas_spar_com_fx.c

+87 −1

Original line number	Diff line number	Diff line
		@@ -2361,18 +2361,30 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		Word32 re1, re2;

		W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[0][0], cov_dd_re[0][0] ); /q_cov_dd_re+ pSparMd->band_coeffs[b_ts_idx].q_C_re_fx/
		#ifdef OPT_SBA_ENC_V2_BE
		q_tmp1 = sub( W_norm( W_tmp ), 32 );
		re1 = W_shl_sat_l( W_tmp, q_tmp1 ); /q_cov_dd_re+ q_C_re+q_tmp1/
		q_tmp1 = add( add( q_C_re, q_tmp1 ), q_cov_dd_re );
		#else
		q_tmp1 = W_norm( W_tmp );
		re1 = W_extract_h( W_shl( W_tmp, q_tmp1 ) ); /q_cov_dd_re+ q_C_re+q_tmp1-32/
		q_tmp1 = sub( add( add( q_C_re, q_tmp1 ), q_cov_dd_re ), 32 );
		#endif
		if ( W_tmp == 0 )
		{
		q_tmp1 = 31;
		move16();
		}
		W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[1][0], cov_dd_re[0][0] ); /q_cov_dd_re+ q_C_re/
		#ifdef OPT_SBA_ENC_V2_BE
		q_tmp = sub( W_norm( W_tmp ), 32 );
		re2 = W_shl_sat_l( W_tmp, q_tmp ); /q_cov_dd_re+ q_C_re+q_tmp/
		q_tmp = add( add( q_C_re, q_tmp ), q_cov_dd_re );
		#else
		q_tmp = W_norm( W_tmp );
		re2 = W_extract_h( W_shl( W_tmp, q_tmp ) ); /q_cov_dd_re+ q_C_re+q_tmp-32/
		q_tmp = sub( add( add( q_C_re, q_tmp ), q_cov_dd_re ), 32 );
		#endif
		if ( W_tmp == 0 )
		{
		q_tmp = 31;
		@@ -2380,12 +2392,20 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		}

		W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[0][0], re1 ); // q_tmp1+q_C_re
		#ifdef OPT_SBA_ENC_V2_BE
		q_factor = sub( W_norm( W_tmp ), 32 );
		recon_uu_re[0][0] = W_shl_sat_l( W_tmp, q_factor ); // q_tmp1+q_C_re+q_recon_uu_re[0][0]
		move32();
		q_recon_uu_re[0][0] = add( add( q_C_re, q_factor ), q_tmp1 );
		move16();
		#else
		q_recon_uu_re[0][0] = W_norm( W_tmp );
		move16();
		recon_uu_re[0][0] = W_extract_h( W_shl( W_tmp, q_recon_uu_re[0][0] ) ); // q_tmp1+q_C_re+q_recon_uu_re[0][0]-32
		move32();
		q_recon_uu_re[0][0] = sub( add( add( q_C_re, q_recon_uu_re[0][0] ), q_tmp1 ), 32 );
		move16();
		#endif
		if ( W_tmp == 0 )
		{
		q_recon_uu_re[0][0] = 31;
		@@ -2393,12 +2413,20 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		}

		W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[1][0], re1 ); // q_C_re+q_tmp1
		#ifdef OPT_SBA_ENC_V2_BE
		q_factor = sub( W_norm( W_tmp ), 32 );
		recon_uu_re[0][1] = W_shl_sat_l( W_tmp, q_factor ); // q_C_re+q_tmp1+q_recon_uu_re[0][1]
		move32();
		q_recon_uu_re[0][1] = add( add( q_C_re, q_factor ), q_tmp1 );
		move16();
		#else
		q_recon_uu_re[0][1] = W_norm( W_tmp );
		move16();
		recon_uu_re[0][1] = W_extract_h( W_shl( W_tmp, q_recon_uu_re[0][1] ) ); // q_C_re+q_tmp1+q_recon_uu_re[0][1]-32
		move32();
		q_recon_uu_re[0][1] = sub( add( add( q_C_re, q_recon_uu_re[0][1] ), q_tmp1 ), 32 );
		move16();
		#endif
		if ( W_tmp == 0 )
		{
		q_recon_uu_re[0][1] = 31;
		@@ -2406,12 +2434,20 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		}

		W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[0][0], re2 ); // q_C_re+q_tmp
		#ifdef OPT_SBA_ENC_V2_BE
		q_factor = sub( W_norm( W_tmp ), 32 );
		recon_uu_re[1][0] = W_shl_sat_l( W_tmp, q_factor ); // q_C_re+q_tmp+q_recon_uu_re[1][0]
		move32();
		q_recon_uu_re[1][0] = add( add( q_C_re, q_factor ), q_tmp );
		move16();
		#else
		q_recon_uu_re[1][0] = W_norm( W_tmp );
		move16();
		recon_uu_re[1][0] = W_extract_h( W_shl( W_tmp, q_recon_uu_re[1][0] ) ); // q_C_re+q_tmp+q_recon_uu_re[1][0]-32
		move32();
		q_recon_uu_re[1][0] = sub( add( add( q_C_re, q_recon_uu_re[1][0] ), q_tmp ), 32 );
		move16();
		#endif
		if ( W_tmp == 0 )
		{
		q_recon_uu_re[1][0] = 31;
		@@ -2419,12 +2455,20 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		}

		W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[1][0], re2 ); // q_C_re+q_tmp
		#ifdef OPT_SBA_ENC_V2_BE
		q_factor = sub( W_norm( W_tmp ), 32 );
		recon_uu_re[1][1] = W_shl_sat_l( W_tmp, q_factor ); // q_C_re+q_tmp+q_recon_uu_re[1][1]
		move32();
		q_recon_uu_re[1][1] = add( add( q_C_re, q_factor ), q_tmp );
		move16();
		#else
		q_recon_uu_re[1][1] = W_norm( W_tmp );
		move16();
		recon_uu_re[1][1] = W_extract_h( W_shl( W_tmp, q_recon_uu_re[1][1] ) ); // q_C_re+q_tmp+q_recon_uu_re[1][1]-32
		move32();
		q_recon_uu_re[1][1] = sub( add( add( q_C_re, q_recon_uu_re[1][1] ), q_tmp ), 32 );
		move16();
		#endif
		if ( W_tmp == 0 )
		{
		q_recon_uu_re[1][1] = 31;
		@@ -2441,12 +2485,18 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		}
		}
		q_tmp = sub( s_min( q_tmp, q_cov_uu_re ), 1 );

		#ifdef OPT_SBA_ENC_V2_BE
		q_factor = sub( q_cov_uu_re, q_tmp );
		#endif
		FOR( i = 0; i < 2; i++ )
		{
		FOR( j = 0; j < 2; j++ )
		{
		#ifdef OPT_SBA_ENC_V2_BE
		cov_uu_re[i][j] = L_sub( L_shr( cov_uu_re[i][j], q_factor ), L_shr( recon_uu_re[i][j], sub( q_recon_uu_re[i][j], q_tmp ) ) ); // q_tmp
		#else
		cov_uu_re[i][j] = L_sub( L_shr( cov_uu_re[i][j], sub( q_cov_uu_re, q_tmp ) ), L_shr( recon_uu_re[i][j], sub( q_recon_uu_re[i][j], q_tmp ) ) ); // q_tmp
		#endif
		move32();
		}
		}
		@@ -2466,9 +2516,15 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		{
		Word32 re;
		W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[0][k], cov_dd_re[k][j] ); // q_C_re+q_cov_dd_re
		#ifdef OPT_SBA_ENC_V2_BE
		q_tmp = sub( W_norm( W_tmp ), 33 );
		re = W_shl_sat_l( W_tmp, q_tmp ); // q_C_re+q_cov_dd_re+q_tmp
		q_tmp = add( add( q_C_re, q_tmp ), q_cov_dd_re );
		#else
		q_tmp = sub( W_norm( W_tmp ), 1 );
		re = W_extract_h( W_shl( W_tmp, q_tmp ) ); // q_C_re+q_cov_dd_re+q_tmp-32
		q_tmp = sub( add( add( q_C_re, q_tmp ), q_cov_dd_re ), 32 );
		#endif
		if ( W_tmp == 0 )
		{
		q_tmp = 31;
		@@ -2492,9 +2548,15 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		}

		W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[0][0], re1[0] ); // q_C_re+q_re1[0]
		#ifdef OPT_SBA_ENC_V2_BE
		q_tmp = sub( W_norm( W_tmp ), 33 );
		re2 = W_shl_sat_l( W_tmp, q_tmp ); // q_C_re+q_re1[0]+q_tmp
		q_tmp = add( add( q_C_re, q_tmp ), q_re1[0] );
		#else
		q_tmp = sub( W_norm( W_tmp ), 1 );
		re2 = W_extract_h( W_shl( W_tmp, q_tmp ) ); // q_C_re+q_re1[0]+q_tmp-32
		q_tmp = sub( add( add( q_C_re, q_tmp ), q_re1[0] ), 32 );
		#endif
		if ( W_tmp == 0 )
		{
		q_tmp = 31;
		@@ -2504,9 +2566,15 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		move32();

		W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[0][1], re1[1] ); // q_C_re+q_re1[1]
		#ifdef OPT_SBA_ENC_V2_BE
		q_tmp1 = sub( W_norm( W_tmp ), 33 );
		re2 = W_shl_sat_l( W_tmp, q_tmp1 ); // q_C_re+q_re1[1]+q_tmp1
		q_tmp1 = add( add( q_C_re, q_tmp1 ), q_re1[1] );
		#else
		q_tmp1 = sub( W_norm( W_tmp ), 1 );
		re2 = W_extract_h( W_shl( W_tmp, q_tmp1 ) ); // q_C_re+q_re1[1]+q_tmp1-32
		q_tmp1 = sub( add( add( q_C_re, q_tmp1 ), q_re1[1] ), 32 );
		#endif
		if ( W_tmp == 0 )
		{
		q_tmp1 = 31;
		@@ -2585,9 +2653,15 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		FOR( k = 0; k < num_dmx - 1; k++ )
		{
		W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[i][k], cov_dd_re[k][m] ); // q_C_re+q_cov_dd_re
		#ifdef OPT_SBA_ENC_V2_BE
		q_tmp = sub( W_norm( W_tmp ), 34 );
		re = W_shl_sat_l( W_tmp, q_tmp ); // q_C_re+q_cov_dd_re+q_tmp
		q_tmp = add( add( q_C_re, q_tmp ), q_cov_dd_re );
		#else
		q_tmp = sub( W_norm( W_tmp ), 2 );
		re = W_extract_h( W_shl( W_tmp, q_tmp ) ); // q_C_re+q_cov_dd_re+q_tmp-32
		q_tmp = sub( add( add( q_C_re, q_tmp ), q_cov_dd_re ), 32 );
		#endif
		if ( W_tmp == 0 )
		{
		q_tmp = 31;
		@@ -2627,9 +2701,15 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		FOR( m = 0; m < num_dmx - 1; m++ )
		{
		W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[j][m], re1[m] ); // q_C_re+q_re1[m]
		#ifdef OPT_SBA_ENC_V2_BE
		q_tmp = sub( W_norm( W_tmp ), 34 );
		re = W_shl_sat_l( W_tmp, q_tmp ); // q_C_re+q_re1[m]+q_tmp
		q_tmp = add( add( q_C_re, q_tmp ), q_re1[m] );
		#else
		q_tmp = sub( W_norm( W_tmp ), 2 );
		re = W_extract_h( W_shl( W_tmp, q_tmp ) ); // q_C_re+q_re1[m]+q_tmp-32
		q_tmp = sub( add( add( q_C_re, q_tmp ), q_re1[m] ), 32 );
		#endif
		if ( W_tmp == 0 )
		{
		q_tmp = 31;
		@@ -2714,9 +2794,15 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
		move16();
		IF( trace != 0 )
		{
		#ifdef OPT_SBA_ENC_V2_BE
		q_factor = sub( W_norm( trace ), 32 );
		tmp = Mpy_32_32( p_norm_scaling, W_shl_sat_l( trace, q_factor ) ); // q_cov_uu_re+q_factor
		q_factor = add( q_cov_uu_re, q_factor );
		#else
		q_factor = W_norm( trace );
		tmp = Mpy_32_32( p_norm_scaling, W_extract_h( W_shl( trace, q_factor ) ) ); // q_cov_uu_re+q_factor-32
		q_factor = sub( add( q_cov_uu_re, q_factor ), 32 );
		#endif
		IF( GT_16( q_factor, q_postpred_cov_re ) )
		{
		tmp = L_shr( tmp, sub( q_factor, q_postpred_cov_re ) ); // q_postpred_cov_re

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@
		#ifndef BASOP_NOGLOB_DEV_USE_GLOBALS
		#define BASOP_NOGLOB_DECLARE_LOCAL
		#endif
		#define FIX_732_MS_PERIODOG_FLOOR /* Eri: Issue-732: Dynamic range of msPeriodog leads to minimum value 1e-5 being truncated to zero. This uses the smallest non-zero value instead. */

		#define FIX_867_CLDFB_NRG_SCALE

		@@ -78,6 +79,7 @@
		#define OPT_SBA_REND_V1_BE
		#define OPT_HEAD_ROT_REND_V1_BE
		#define OPT_SBA_DEC_V2_BE
		#define OPT_SBA_ENC_V2_BE
		#define OPT_SBA_ENC_V1_BE
		#define OPT_BIN_RENDERER_V1
		#define OPT_BIN_RENDERER_V2

lib_dec/dec_tcx_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2886,7 +2886,7 @@ void IMDCT_ivas_fx(
		{
		Word16 q_old_out = q_win;
		move16();
		edct_fx( x_fx, xn_buf_fx_32 + add( shr( overlap, 1 ), nz ), L_frame, &q_xn_buf_fx_32 );
		edct_ivas_fx( x_fx, xn_buf_fx_32 + add( shr( overlap, 1 ), nz ), L_frame, &q_xn_buf_fx_32 );
		Word16 res_m, res_e;
		res_e = 0;
		move16();

lib_dec/fd_cng_dec_fx.c

+33 −2

Original line number	Diff line number	Diff line
		@@ -1501,14 +1501,19 @@ void perform_noise_estimation_dec_ivas_fx(
		Word16 enr_e, enr_ratio, alpha;
		Word32 *msPeriodog;
		Word32 *msNoiseEst;
		#ifdef FIX_732_MS_PERIODOG_FLOOR
		Word32 msPeriodog_floor;
		#endif
		Word32 *reIter;
		Word32 rescale_fac = 0;
		Word64 W_tmp;
		Word16 tmp_s, tmp_q, min_q = 31;
		Word16 q_shift;
		Word32 max_l;
		Word16 norm_shift;

		#ifdef FIX_732_MS_PERIODOG_FLOOR
		Word16 norm_shift, check = 0;
		move16();
		#endif
		/* pointer initialization */
		periodog = hFdCngDec->hFdCngCom->periodog; /Q31 - hFdCngDec->hFdCngCom->periodog_exp/
		fftBuffer = hFdCngDec->hFdCngCom->fftBuffer; /Q31 - hFdCngDec->hFdCngCom->fftBuffer_exp/
		@@ -1706,12 +1711,38 @@ void perform_noise_estimation_dec_ivas_fx(
		msPeriodog[p] = L_add( msPeriodog[p], L_tmp ); /Q31 - hFdCngDec->msPeriodog_exp/
		move32();

		#ifdef FIX_732_MS_PERIODOG_FLOOR
		msPeriodog_floor = L_max( 1, L_shr( 21474 /Q31/, hFdCngDec->msPeriodog_exp ) ); /Q31 - hFdCngDec->msPeriodog_exp/
		IF( LT_32( msPeriodog[p], msPeriodog_floor ) )
		#else
		IF( LT_32( msPeriodog[p], L_shr( 21474 /Q31/, hFdCngDec->msPeriodog_exp ) ) )
		#endif
		{
		#ifdef FIX_732_MS_PERIODOG_FLOOR
		msPeriodog[p] = msPeriodog_floor;
		move32();
		#else
		msPeriodog[p] = L_shr( 21474 /Q31/, hFdCngDec->msPeriodog_exp ); /Q31 - hFdCngDec->msPeriodog_exp/
		move32();
		#endif
		}
		}
		#ifdef FIX_732_MS_PERIODOG_FLOOR
		FOR( p = 0; p < npart; p++ )
		{
		IF( GT_32( msPeriodog[p], 1 ) )
		{
		check = 1;
		move16();
		BREAK;
		}
		}
		IF( check == 0 )
		{
		hFdCngDec->msPeriodog_exp = 14; /* msPeriodog buffer will have minimum value as 1e-5f */
		move16();
		}
		#endif
		}

		/* calculate total energy (short-term and long-term) */