replace Copy_Scale_sig_16_32 by Copy_Scale_sig_16_32_DEPREC (1629a6c9) · Commits · SA4 / Audio / IVAS BASOP

lib_com/prot_fx.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -10005,7 +10005,7 @@ void Scale_sig32(
		const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */
		);

		void Copy_Scale_sig_16_32(
		void Copy_Scale_sig_16_32_DEPREC(
		const Word16 x[], /* i : signal to scale i Qx */
		Word32 y[], /* o : scaled signal output Qx */
		const Word16 lg, /* i : size of x[] Q0 */

lib_com/tools_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -750,7 +750,7 @@ void Copy_Scale_sig(
		*
		* Up/down scale a 16 bits vector x and move it into y
		-------------------------------------------------------------------/
		void Copy_Scale_sig_16_32(
		void Copy_Scale_sig_16_32_DEPREC(
		const Word16 x[], /* i : signal to scale input Qx */
		Word32 y[], /* o : scaled signal output Qx */
		const Word16 lg, /* i : size of x[] Q0 */

lib_dec/FEC_HQ_phase_ecu_fx.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1590,7 +1590,7 @@ static void ivas_spec_ana_fx(
		test();
		IF( n > 0 && pPlocs == 0 ) / Very 1st peak position possible to have a peak at 0/DC index position. */
		{
		Copy_Scale_sig_16_32( &xfp[*pPlocs], xfp_32, 3, Q16 ); // Q + 16
		Copy_Scale_sig_16_32_DEPREC( &xfp[*pPlocs], xfp_32, 3, Q16 ); // Q + 16
		acc = L_deposit_h( *pPlocs ); // Q16
		pPlocsi++ = L_add( acc, L_shl( imax_pos_fx( xfp_32 ) / Q15 */, 1 ) ); // Q16
		move32();
		@@ -1601,7 +1601,7 @@ static void ivas_spec_ana_fx(
		test();
		IF( n > 0 && EQ_16( pPlocs, 1 ) ) / Also 2nd peak position uses DC which makes jacobsen unsuitable. */
		{
		Copy_Scale_sig_16_32( &xfp[*pPlocs - 1], xfp_32, 3, Q16 ); // Q + 16
		Copy_Scale_sig_16_32_DEPREC( &xfp[*pPlocs - 1], xfp_32, 3, Q16 ); // Q + 16
		acc = L_deposit_h( sub( *pPlocs, 1 ) ); // Q16
		pPlocsi++ = L_add( acc, L_shl( imax_pos_fx( xfp_32 ) / Q15 */, 1 ) ); // Q16
		move32();
		@@ -1647,7 +1647,7 @@ static void ivas_spec_ana_fx(

		IF( EQ_16( currPlocs, ( sub( Lprot2_1, DELTA_CORR_F0_INT ) ) ) ) /* Also 2nd last peak position uses fs/2 which makes jacobsen less suitable. */
		{
		Copy_Scale_sig_16_32( &xfp[currPlocs - 1], xfp_32, 3, Q16 ); // Q + 16
		Copy_Scale_sig_16_32_DEPREC( &xfp[currPlocs - 1], xfp_32, 3, Q16 ); // Q + 16
		acc = L_deposit_h( sub( currPlocs, 1 ) ); // Q16
		pPlocsi++ = L_add( acc, L_shl( imax_pos_fx( xfp_32 ) / Q15 */, 1 ) ); // Q16
		move32();
		@@ -1661,7 +1661,7 @@ static void ivas_spec_ana_fx(
		* whould point */
		IF( n > 0 ) /* fs/2 which makes special case . */
		{
		Copy_Scale_sig_16_32( &xfp[currPlocs - 2], xfp_32, 3, Q16 ); // Q + 16
		Copy_Scale_sig_16_32_DEPREC( &xfp[currPlocs - 2], xfp_32, 3, Q16 ); // Q + 16
		acc = L_deposit_h( sub( currPlocs, 2 ) ); // Q16
		pPlocsi++ = L_add( acc, L_shl( imax_pos_fx( xfp_32 ) / Q15 */, 1 ) ); // Q16
		move32();
		@@ -3989,7 +3989,7 @@ static void ivas_fec_ecu_dft_fx(
		tmp = Exp16Array( *Nfft, Tfr16 );
		exp = add( tmp, add( 2, norm_s( Nfft ) ) );
		move16();
		Copy_Scale_sig_16_32( Tfr16, Tfr32, Nfft, exp ); /Qin+exp; /
		Copy_Scale_sig_16_32_DEPREC( Tfr16, Tfr32, Nfft, exp ); /Qin+exp; /
		exp = s_min( exp, 15 );

		DoRTFTn_fx( Tfr32, Tfi32, *Nfft );
		@@ -4105,7 +4105,7 @@ static void fec_ecu_dft_fx(
		tmp = Exp16Array( *Nfft, Tfr16 );
		exp = add( tmp, add( 2, norm_s( Nfft ) ) );
		move16();
		Copy_Scale_sig_16_32( Tfr16, Tfr32, Nfft, exp ); /Qin+exp; /
		Copy_Scale_sig_16_32_DEPREC( Tfr16, Tfr32, Nfft, exp ); /Qin+exp; /

		DoRTFTn_fx( Tfr32, Tfi32, *Nfft );
		N_LP = shr( *Nfft, 1 );

lib_dec/acelp_core_dec_ivas_fx.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -1735,12 +1735,12 @@ ivas_error acelp_core_dec_ivas_fx(
		pImagSave_fx[i] = imagBufferSave_fx[i];
		}
		#ifndef MSAN_FIX
		Copy_Scale_sig_16_32( bpf_error_signal_16fx, bpf_error_signal_fx, st->L_frame, -1 ); // Q_syn-1
		Copy_Scale_sig_16_32_DEPREC( bpf_error_signal_16fx, bpf_error_signal_fx, st->L_frame, -1 ); // Q_syn-1
		#endif
		IF( st->p_bpf_noise_buf_32 )
		{
		#ifdef MSAN_FIX
		Copy_Scale_sig_16_32( bpf_error_signal_16fx, bpf_error_signal_fx, st->L_frame, -1 ); // Q_syn-1
		Copy_Scale_sig_16_32_DEPREC( bpf_error_signal_16fx, bpf_error_signal_fx, st->L_frame, -1 ); // Q_syn-1
		#endif
		Copy32( bpf_error_signal_fx, st->p_bpf_noise_buf_32, st->L_frame );
		Scale_sig32( st->p_bpf_noise_buf_32, st->L_frame, sub( Q11, sub( st->Q_syn, 1 ) ) ); // Q11
		@@ -1772,9 +1772,9 @@ ivas_error acelp_core_dec_ivas_fx(
		q_bpf_error_signal = Q6;
		move16();
		#ifdef MSAN_FIX
		Copy_Scale_sig_16_32( bpf_error_signal_16fx, tmp_bpf_error_signal_fx, st->L_frame, sub( q_bpf_error_signal, st->Q_syn ) ); // Q6
		Copy_Scale_sig_16_32_DEPREC( bpf_error_signal_16fx, tmp_bpf_error_signal_fx, st->L_frame, sub( q_bpf_error_signal, st->Q_syn ) ); // Q6
		#else
		Copy_Scale_sig_16_32( bpf_error_signal_16fx, tmp_bpf_error_signal_fx, L_FRAME16k, q_bpf_error_signal - st->Q_syn ); // Q6
		Copy_Scale_sig_16_32_DEPREC( bpf_error_signal_16fx, tmp_bpf_error_signal_fx, L_FRAME16k, q_bpf_error_signal - st->Q_syn ); // Q6
		#endif
		FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
		{
		@@ -1999,7 +1999,7 @@ ivas_error acelp_core_dec_ivas_fx(
		// Get Q-factor
		q_bpf_error_signal = Q6;
		move16();
		Copy_Scale_sig_16_32( bpf_error_signal_16fx, tmp_bpf_error_signal_fx, L_FRAME16k, sub( q_bpf_error_signal, st->Q_syn ) ); // Q6
		Copy_Scale_sig_16_32_DEPREC( bpf_error_signal_16fx, tmp_bpf_error_signal_fx, L_FRAME16k, sub( q_bpf_error_signal, st->Q_syn ) ); // Q6
		FOR( i = 0; i < CLDFB_NO_COL_MAX; i++ )
		{
		Scale_sig32( realBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, -Q7 ); // Q0
		@@ -2066,7 +2066,7 @@ ivas_error acelp_core_dec_ivas_fx(
		move16();
		IF( st->p_bpf_noise_buf_32 )
		{
		Copy_Scale_sig_16_32( bpf_error_signal_16fx, bpf_error_signal_fx, st->L_frame, -1 ); // Q_syn-1
		Copy_Scale_sig_16_32_DEPREC( bpf_error_signal_16fx, bpf_error_signal_fx, st->L_frame, -1 ); // Q_syn-1
		Copy32( bpf_error_signal_fx, st->p_bpf_noise_buf_32, st->L_frame );

		Scale_sig32( st->p_bpf_noise_buf_32, st->L_frame, sub( Q11, sub( st->Q_syn, 1 ) ) ); // Q11
		@@ -2112,9 +2112,9 @@ ivas_error acelp_core_dec_ivas_fx(
		psyn_fx, synth_fx16, st->Q_exc, st->Q_syn2, st->hBWE_zero->delay_syn_hf_fx, &st->hBWE_zero->memExp1,
		st->hBWE_zero->mem_hp_interp_fx, st->extl, st->CNG_mode );
		#ifdef MSAN_FIX
		Copy_Scale_sig_16_32( synth_fx16, synth_fx, output_frame, 0 );
		Copy_Scale_sig_16_32_DEPREC( synth_fx16, synth_fx, output_frame, 0 );
		#else
		Copy_Scale_sig_16_32( synth_fx16, synth_fx, L_FRAME48k, 0 );
		Copy_Scale_sig_16_32_DEPREC( synth_fx16, synth_fx, L_FRAME48k, 0 );
		#endif
		}
		ELSE
		@@ -2157,7 +2157,7 @@ ivas_error acelp_core_dec_ivas_fx(
		test();
		IF( !st->ppp_mode_dec && ( st->idchan == 0 \|\| NE_16( st->element_mode, IVAS_CPE_TD ) \|\| ( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_TD ) && st->tdm_LRTD_flag ) ) )
		{
		Copy_Scale_sig_16_32( st->hBWE_TD->old_bwe_exc_extended_fx, bwe_exc_extended_fx, NL_BUFF_OFFSET, ( sub( shl( st->Q_exc, 1 ), sub( st->prev_Q_bwe_exc, 16 ) ) ) ); // prev_Q_bwe_exc
		Copy_Scale_sig_16_32_DEPREC( st->hBWE_TD->old_bwe_exc_extended_fx, bwe_exc_extended_fx, NL_BUFF_OFFSET, ( sub( shl( st->Q_exc, 1 ), sub( st->prev_Q_bwe_exc, 16 ) ) ) ); // prev_Q_bwe_exc
		non_linearity_ivas_fx( bwe_exc_fx, bwe_exc_extended_fx + NL_BUFF_OFFSET, L_FRAME32k, &st->hBWE_TD->bwe_non_lin_prev_scale_fx, st->Q_exc, st->coder_type, voice_factors_fx, st->L_frame );
		Copy_Scale_sig_32_16( bwe_exc_extended_fx + L_FRAME32k, st->hBWE_TD->old_bwe_exc_extended_fx, NL_BUFF_OFFSET, negate( sub( shl( st->Q_exc, 1 ), sub( st->prev_Q_bwe_exc, 16 ) ) ) ); // prev_Q_bwe_exc
		}

lib_dec/acelp_core_switch_dec_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -816,7 +816,7 @@ ivas_error acelp_core_switch_dec_bfi_ivas_fx(
		----------------------------------------------------------------/
		/* CLDFB analysis of the synthesis at internal sampling rate */
		Qtmp = sub( 11, st_fx->Q_syn );
		Copy_Scale_sig_16_32( syn, syn32, L_FRAME16k, Qtmp ); // Q(11)
		Copy_Scale_sig_16_32_DEPREC( syn, syn32, L_FRAME16k, Qtmp ); // Q(11)
		IF( NE_32( ( error = cldfb_save_memory_ivas_fx( st_fx->cldfbAna ) ), IVAS_ERR_OK ) )
		{
		return error;
		@@ -836,7 +836,7 @@ ivas_error acelp_core_switch_dec_bfi_ivas_fx(
		Scale_sig32( st_fx->cldfbSyn->cldfb_state_fx, st_fx->cldfbSyn->cldfb_state_length, 1 ); // Q_cldfb_state+1
		st_fx->cldfbSyn->Q_cldfb_state = add( st_fx->cldfbSyn->Q_cldfb_state, 1 );
		move16();
		Copy_Scale_sig_16_32( synth_out, synth32, L_FRAME48k, 5 ); /11-5-1/
		Copy_Scale_sig_16_32_DEPREC( synth_out, synth32, L_FRAME48k, 5 ); /11-5-1/

		// cldfbSynthesis_ivas_fx(realBuffer, imagBuffer, synth_out, (int16_t)(st_fx->output_Fs * 0.01f), st_fx->cldfbSyn);
		cldfbSynthesis_ivas_fx( realBuffer, imagBuffer, synth32, extract_l( Mpy_32_16_1( st_fx->output_Fs, 328 ) ), st_fx->cldfbSyn );