Issue fixes merged, MLD measurement (a8cf8590) · Commits · SA4 / Audio / IVAS BASOP

lib_dec/dec_tcx_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2636,10 +2636,10 @@ void IMDCT_ivas_fx(
		{
		Word32 fac;
		// fac = shl_sat( mult_r( extract_h( L_shr_sat( hTcxDec->conceal_eof_gain32, sub( 1, hTcxDec->conceal_eof_gain_e ) ) ), st->last_concealed_gain_syn_deemph ), 1 );
		fac = Mpy_32_16_1( hTcxDec->conceal_eof_gain32, st->last_concealed_gain_syn_deemph ); // q = 31 - hTcxDec->conceal_eof_gain_e
		fac = Mpy_32_16_1( hTcxDec->conceal_eof_gain32, st->last_concealed_gain_syn_deemph ); // q = 31 - hTcxDec->conceal_eof_gain_e - last_concealed_gain_syn_deemph_e
		FOR( Word16 ind = 0; ind < overlap; ind++ )
		{
		old_syn_overl_fx[ind] = extract_l( L_shl_sat( Mpy_32_32( old_syn_overl_fx[ind], fac ), hTcxDec->conceal_eof_gain_e ) ); // Q(-2)
		old_syn_overl_fx[ind] = extract_h( L_shl_sat( Mpy_32_16_1( fac, old_syn_overl_fx[ind] ), add( hTcxDec->conceal_eof_gain_e, st->last_concealed_gain_syn_deemph_e ) ) ); // Q(-2)
		move16();
		}
		}

lib_dec/fd_cng_dec_fx.c

+15 −19

Original line number	Diff line number	Diff line
		@@ -1318,14 +1318,11 @@ Word16 ApplyFdCng_ivas_fx(
		e_shift = sub( s, q_norm );
		}
		}
		FOR( ; k < hFdCngCom->npart; k++ )
		{
		FOR( ; j <= hFdCngCom->part[k]; j++ )
		FOR( ; j < FFTCLDFBLEN; j++ )
		{
		cngNoiseLevel[j] = L_shl( cngNoiseLevel[j], sub( s, e_shift ) ); /Q: s/
		move32();
		}
		}

		*cngNoiseLevel_exp = add( add( hFdCngDec->bandNoiseShape_exp, s2 ), e_shift );
		move16();
		@@ -1685,14 +1682,13 @@ Word16 ApplyFdCng_ivas_fx(
		}
		/* adapt scaling for rest of the buffer */
		s = sub( *cngNoiseLevel_exp, add( hFdCngDec->bandNoiseShape_exp, s2 ) );
		FOR( ; k < hFdCngCom->npart; k++ )
		{
		FOR( ; j <= hFdCngCom->part[k]; j++ )

		FOR( ; j < FFTCLDFBLEN; j++ )
		{
		cngNoiseLevel[j] = L_shl( cngNoiseLevel[j], s ); /Q31 - hFdCngDec->bandNoiseShape_exp + s/
		move32();
		}
		}

		*cngNoiseLevel_exp = add( hFdCngDec->bandNoiseShape_exp, s2 );
		move16();
		}
		@@ -1759,15 +1755,15 @@ Word16 ApplyFdCng_ivas_fx(
		}
		/* adapt scaling for rest of the buffer */
		s = sub( *cngNoiseLevel_exp, add( hFdCngDec->bandNoiseShape_exp, s2 ) );
		FOR( ; k < hFdCngCom->npart; k++ )
		{
		FOR( ; j <= hFdCngCom->part[k]; j++ )

		FOR( ; j < FFTCLDFBLEN; j++ )
		{
		/* NOTE: saturation is added here as part of issue 1218 fix. after rescaling the fdcng noise estimation buffers, due to slight precision loss, values may slightly overflow */
		cngNoiseLevel[j] = L_shl_sat( cngNoiseLevel[j], s ); /Q31 - hFdCngDec->bandNoiseShape_exp + s/
		move32();
		}
		}


		*cngNoiseLevel_exp = add( hFdCngDec->bandNoiseShape_exp, s2 );
		move16();
		}

lib_dec/ivas_mdct_core_dec_fx.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1623,6 +1623,8 @@ void ivas_mdct_core_tns_ns_fx(
		}
		q_2 = q_x;
		move16();
		Word16 length2 = length;
		move16();
		sns_shape_spectrum_fx( x_fx[ch][k], &q_x, st->hTcxCfg->psychParamsCurrent, sns_int_scf_fx, q_sns_int_scf, st->hTcxCfg->psychParamsCurrent->nBins, &length );
		IF( LT_16( q_2, add( q_x, 1 ) ) ) /scaling to q_2/
		{
		@@ -1632,7 +1634,7 @@ void ivas_mdct_core_tns_ns_fx(
		}
		ELSE /scaling to q_x+1/
		{
		Scale_sig32( &x_fx[ch][k][0] + length, sub( L_spec[ch], length ), sub( add( q_x, 1 ), q_2 ) );
		Scale_sig32( &x_fx[ch][k][0] + length, sub( length2, length ), sub( add( q_x, 1 ), q_2 ) );
		q_x = add( q_x, 1 );
		}
		x_e[ch][k] = sub( 31, q_x );

lib_enc/ivas_core_pre_proc_front_fx.c

+10 −11

Original line number	Diff line number	Diff line
		@@ -1855,7 +1855,7 @@ static void calculate_energy_buffer_ivas_fx(
		const Word32 input_Fs, /* i : input sampling rate Q0*/
		Word16 *enerBuffer_dft_e )
		{
		Word16 i, j;
		Word16 i, j, guard_bits;
		Word64 nrg_DMX_fx[CLDFB_NO_CHANNELS_MAX];
		Word64 *p_nrg_DMX_fx;
		Word32 pDFT_DMX_fx; /q_DFT_DMX_fx*/
		@@ -1863,8 +1863,6 @@ static void calculate_energy_buffer_ivas_fx(
		Word16 band_res_dft_fx, chan_width_f_fx, start, stop;
		Word16 norm_nrg_DMX_fx;
		Word64 max_abs_nrg_DMX_fx;
		Flag overflow = 0;
		move32();

		max_abs_nrg_DMX_fx = 0;
		move64();
		@@ -1881,22 +1879,23 @@ static void calculate_energy_buffer_ivas_fx(
		start = 1;
		move16();

		guard_bits = add( find_guarded_bits_fx( extract_h( chan_width_bins_fx ) ), 1 ); /* Q0 */

		pDFT_DMX_fx = hCPE->hStereoDft->DFT_fx[0]; /* q_DFT_DMX_fx = 31 - hCPE->hStereoDft->DFT_fx_e[0] */
		p_nrg_DMX_fx = nrg_DMX_fx;

		p_nrg_DMX_fx = Mpy_32_32( pDFT_DMX_fx[0], pDFT_DMX_fx[0] ); /2 * q_DFT_DMX_fx -31 */
		p_nrg_DMX_fx = W_shr( W_mult_32_32( pDFT_DMX_fx[0], pDFT_DMX_fx[0] ), guard_bits ); / 2 * q_DFT_DMX_fx + 1 - guard_bits */
		move64();

		FOR( i = 0; i < no_channels; i++ )
		{
		stop = extract_l( L_shr( L_add( Mpy_32_16_1( chan_width_bins_fx, add( i, 1 ) ), 1 ), 1 ) );
		stop = extract_l( L_shr( L_add( Mpy_32_16_1( chan_width_bins_fx, add( i, 1 ) ), 1 ), 1 ) ); /* Q0 */
		FOR( j = start; j < stop; j++ )
		{
		p_nrg_DMX_fx = W_add( p_nrg_DMX_fx, Mpy_32_32( pDFT_DMX_fx[2 * j], pDFT_DMX_fx[2 * j] ) ); /2 q_DFT_DMX_fx -31 */
		p_nrg_DMX_fx = W_add( p_nrg_DMX_fx, W_shr( W_mult_32_32( pDFT_DMX_fx[2 * j], pDFT_DMX_fx[2 * j] ), guard_bits ) ); /* 2 * q_DFT_DMX_fx + 1 - guard_bits */
		move64();
		p_nrg_DMX_fx = W_add( p_nrg_DMX_fx, Mpy_32_32( pDFT_DMX_fx[2 * j + 1], pDFT_DMX_fx[2 * j + 1] ) );
		p_nrg_DMX_fx = W_add( p_nrg_DMX_fx, W_shr( W_mult_32_32( pDFT_DMX_fx[2 * j + 1], pDFT_DMX_fx[2 * j + 1] ), guard_bits ) ); /* 2 * q_DFT_DMX_fx + 1 - guard_bits */
		move64();
		// 2 * DFT_fx_e
		}
		IF( GT_64( W_abs( *p_nrg_DMX_fx ), max_abs_nrg_DMX_fx ) )
		{
		@@ -1910,11 +1909,11 @@ static void calculate_energy_buffer_ivas_fx(
		norm_nrg_DMX_fx = W_norm( max_abs_nrg_DMX_fx );
		FOR( i = 0; i < no_channels; i++ ) /* Consider only used channels, dependent on Fs */
		{
		enerBuffer_dft_fx[i] = W_extract_h( W_shl_o( nrg_DMX_fx[i], norm_nrg_DMX_fx, &overflow ) ) / 3; /q_enerBuffer_dft_fx=2 q_DFT_DMX_fx -31+ norm_nrg_DMX_fx -32*/
		enerBuffer_dft_fx[i] = Mpy_32_16_1( W_extract_h( W_shl( nrg_DMX_fx[i], norm_nrg_DMX_fx ) ), 10923 /* 1/3 in Q15 / ); / 2 * q_DFT_DMX_fx + 1 - guard_bits + norm_nrg_DMX_fx - 32 */
		move32();
		}

		enerBuffer_dft_e = sub( add( 32, shl( hCPE->hStereoDft->DFT_fx_e[0], 1 ) ), norm_nrg_DMX_fx ); /31-q_enerBuffer_dft_fx*/
		*enerBuffer_dft_e = sub( add( shl( hCPE->hStereoDft->DFT_fx_e[0], 1 ), guard_bits ), norm_nrg_DMX_fx );
		move16();

		/* Set remaining entries of enerBuffer to zero */

lib_enc/lsf_enc_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -733,7 +733,7 @@ static void lsfq_CNG_ivas_fx(
		/* MSVQ_ROM to be updated */
		mslvq_cng_ivas_fx( idx_cv, dd, qlsf, ddq, idx_lead_cng, idx_scale_cng, wghts );

		index_lvq_ivas_fx( ddq, idx_lead_cng, idx_scale_cng, START_CNG + idx_cv, idx_lvq, 0 );
		index_lvq_ivas_fx( ddq, idx_lead_cng, idx_scale_cng, START_CNG_IVAS + idx_cv, idx_lvq, 0 );
		Vr_add( qlsf, &CNG_SN1_fx[idx_cv * M], qlsf, M );

		/* write the VQ index to the bitstream */