final editorial (b29da443) · Commits · SA4 / Audio / IVAS BASOP

lib_com/prot_fx.h

+8487 −8492

Original line number	Diff line number	Diff line
		@@ -2910,7 +2910,9 @@ Word16 tbe_celp_exc_offset(
		const Word16 L_frame /* i : frame lenght */
		);

		#ifndef CLEANUP_ACELP_ENC
		#ifdef CLEANUP_ACELP_ENC
		void tbe_celp_exc_fx(
		#else
		void tbe_celp_exc(
		const Word16 L_frame_fx, /* i : Frame lenght */
		const Word16 i_subfr_fx, /* i : sub frame */
		@@ -2919,10 +2921,6 @@ void tbe_celp_exc(
		Word16 error_fx, / i/o: Error */
		Word16 bwe_exc_fx / i/o: bandwitdh extension signal */
		);
		#endif
		#ifdef CLEANUP_ACELP_ENC
		void tbe_celp_exc(
		#else
		void tbe_celp_exc_ivas(
		#endif
		const Word16 element_mode, /* i : element mode */
		@@ -6860,8 +6858,10 @@ void highband_exc_dct_in_fx(
		const Word16 L_subfr /* i : subfr lenght */
		);

		#ifndef CLEANUP_ACELP_ENC
		void lp_gain_updt_fx(
		#ifdef CLEANUP_ACELP_ENC
		const Word16 element_mode, /* i : element mode */
		#else
		const Word16 i_subfr, /* i : subframe number Q0 */
		const Word16 gain_pit, /* i : Decoded gain pitch Q14 */
		const Word32 norm_gain_code, /* i : Normalised gain code Q16 */
		@@ -6869,11 +6869,6 @@ void highband_exc_dct_in_fx(
		Word16 lp_gainc, / i/o: LP-filtered code gain (FEC) Q3 */
		const Word16 L_frame /* i : length of the frame */
		);
		#endif
		#ifdef CLEANUP_ACELP_ENC
		void lp_gain_updt_fx(
		const Word16 element_mode, /* i : element mode */
		#else
		void lp_gain_updt_ivas_fx(
		#endif
		const Word16 i_subfr, /* i : subframe number Q0 */

+1 −1

+0 −4

Original line number	Diff line number	Diff line
		@@ -936,10 +936,6 @@ static void decod_gen_voic_core_switch_fx(
		gain_dec_mless_fx( st_fx, L_frame, GENERIC, 0, -1, code, st_fx->old_Es_pred_fx, &gain_pit, &gain_code, &gain_inov, &norm_gain_code );
		}

		/* _ (Word16) gain_pit : quantized pitch gain (Q14) /
		/* _ (Word32) gain_code : quantized codebook gain (Q16) /
		/* _ (Word16) gain_inov : gain of the innovation (used for normalization) (Q12) /
		/* _ (Word32) norm_gain_code : norm. gain of the codebook excitation (Q16) /
		#ifdef CLEANUP_ACELP_ENC
		st_fx->tilt_code_fx = est_tilt_fx( exc, gain_pit, code, gain_code, &voice_fac, Q_exc, L_SUBFR ); /Q15*/
		#else

+1 −1

Original line number	Diff line number	Diff line
		@@ -354,7 +354,7 @@ void decoder_acelp_fx(
		IF( st->igf != 0 )
		{
		#ifdef CLEANUP_ACELP_ENC
		tbe_celp_exc( EVS_MONO, 0, st->L_frame, L_SUBFR, i_subfr, T0, T0_frac, &error, bwe_exc,0 );
		tbe_celp_exc_fx( EVS_MONO, 0, st->L_frame, L_SUBFR, i_subfr, T0, T0_frac, &error, bwe_exc, 0 );
		#else
		tbe_celp_exc( st->L_frame, i_subfr, T0, T0_frac, &error, bwe_exc );
		#endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ ivas_error decod_gen_voic_fx(
		}

		#ifdef CLEANUP_ACELP_ENC
		tbe_celp_exc( st_fx->element_mode, st_fx->idchan, L_frame, L_SUBFR, i_subfr_fx, T0_fx, T0_frac_fx, &error_fx, bwe_exc_fx, st_fx->tdm_LRTD_flag );
		tbe_celp_exc_fx( st_fx->element_mode, st_fx->idchan, L_frame, L_SUBFR, i_subfr_fx, T0_fx, T0_frac_fx, &error_fx, bwe_exc_fx, st_fx->tdm_LRTD_flag );
		#else
		tbe_celp_exc_ivas( st_fx->element_mode, st_fx->idchan, L_frame, L_SUBFR, i_subfr_fx, T0_fx, T0_frac_fx, &error_fx, bwe_exc_fx, st_fx->tdm_LRTD_flag );
		#endif