Correction of call to stat_noise_uv_enc_fx (e516d989) · Commits · SA4 / Audio / IVAS BASOP

lib_enc/acelp_core_enc_fx.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -829,7 +829,12 @@ ivas_error acelp_core_enc_fx(
		IF( NE_16( nelp_mode, 1 ) )
		{
		Copy( exc_fx, exc2_fx, st->L_frame ); // Q_new
		#ifdef HQ_ALIGN_DUPLICATED_CODE
		Word16 q_exc2 = Q_new;
		stat_noise_uv_enc_fx( st, epsP, lsp_new, lsp_mid, Aq, exc2_fx, uc_two_stage_flag, &q_exc2 );
		#else
		stat_noise_uv_enc_fx( st, epsP, lsp_new, lsp_mid, Aq, exc2_fx, uc_two_stage_flag, Q_new );
		#endif
		}
		}
		ELSE

lib_enc/prot_fx_enc.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -1829,6 +1829,18 @@ void encod_audio_fx(
		const Word16 shift /* i : Shift needed to obtain 12 bits vectors */
		);

		#ifdef HQ_ALIGN_DUPLICATED_CODE
		void stat_noise_uv_enc_fx(
		Encoder_State st_fx, / i/o: state structure */
		const Word32 LepsP, / i : LP prediction errors */
		const Word16 isp_new, / i : immittance spectral pairs at 4th sfr */
		const Word16 isp_mid, / i : immittance spectral pairs at 2nd sfr */
		Word16 Aq, / i : A(z) quantized for the 4 subframes */
		Word16 exc2, / i/o: excitation buffer */
		const Word16 uc_two_stage_flag, /* o : flag indicating two-stage UC */
		Word16 *Q_new
		);
		#else
		void stat_noise_uv_enc_fx(
		Encoder_State st_fx, / i/o: state structure */
		const Word32 LepsP, / i : LP prediction errors */
		@@ -1838,6 +1850,7 @@ void stat_noise_uv_enc_fx(
		Word16 exc2, / i/o: excitation buffer */
		const Word16 uc_two_stage_flag, /* o : flag undicating two-stage UC */
		Word16 Q_new );
		#endif
		#ifndef HQ_ALIGN_DUPLICATED_CODE
		void stat_noise_uv_enc_ivas_fx(
		Encoder_State st_fx, / i/o: state structure */

lib_enc/stat_noise_uv_enc_fx.c

+14 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,18 @@
		/* _ None */
		/=======================================================================/

		#ifdef HQ_ALIGN_DUPLICATED_CODE
		void stat_noise_uv_enc_fx(
		Encoder_State st_fx, / i/o: state structure */
		const Word32 LepsP, / i : LP prediction errors */
		const Word16 isp_new, / i : immittance spectral pairs at 4th sfr */
		const Word16 isp_mid, / i : immittance spectral pairs at 2nd sfr */
		Word16 Aq, / i : A(z) quantized for the 4 subframes */
		Word16 exc2, / i/o: excitation buffer */
		const Word16 uc_two_stage_flag, /* o : flag indicating two-stage UC */
		Word16 *Q_new
		)
		#else
		void stat_noise_uv_enc_fx(
		Encoder_State st_fx, / i/o: state structure */
		const Word32 LepsP, / i : LP prediction errors */
		@@ -45,6 +57,7 @@ void stat_noise_uv_enc_fx(
		Word16 exc2, / i/o: excitation buffer */
		const Word16 uc_two_stage_flag, /* o : flag undicating two-stage UC */
		Word16 Q_new )
		#endif
		{
		Word16 noisiness = 0;
		move16();
		@@ -98,7 +111,7 @@ void stat_noise_uv_enc_fx(
		-----------------------------------------------------------------/

		#ifdef HQ_ALIGN_DUPLICATED_CODE
		stat_noise_uv_mod_fx( st_fx->element_mode, st_fx->coder_type, noisiness, st_fx->lsp_old_fx, isp_new, isp_mid, Aq, exc2, &Q_new, 0, &st_fx->ge_sm_fx, &st_fx->uv_count, &st_fx->act_count,
		stat_noise_uv_mod_fx( st_fx->element_mode, st_fx->coder_type, noisiness, st_fx->lsp_old_fx, isp_new, isp_mid, Aq, exc2, Q_new, 0, &st_fx->ge_sm_fx, &st_fx->uv_count, &st_fx->act_count,
		st_fx->lspold_s_fx, &st_fx->noimix_seed, &st_fx->min_alpha_fx, &st_fx->exc_pe_fx,
		st_fx->core_brate, st_fx->bwidth, &st_fx->Q_stat_noise, &st_fx->Q_stat_noise_ge );
		#else