harmonize GenShapedSHBExcitation_ivas_enc_fx() (991ff31a) · Commits · SA4 / Audio / IVAS BASOP

lib_com/prot_fx.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -2982,6 +2982,9 @@ void GenShapedSHBExcitation_fx(
		const Word16 prev_bfi );

		void GenShapedSHBExcitation_ivas_enc_fx(
		#ifdef HARMONIZE_TBE2
		const Word16 enc_dec, /* i : encoder/decoder flag */
		#endif
		Word16 excSHB, / o : synthesized shaped shb excitation Q_bwe_exc*/
		const Word16 lpc_shb, / i : lpc coefficients Q12*/
		Word16 White_exc16k_FB, / o : white excitation for the Fullband extension Q_bwe_exc_fb */
		@@ -10087,7 +10090,7 @@ void v_sub32_fx(
		const Word16 N /* i : Vector length */
		);

		void ivas_swb_tbe_dec_fx(
		void swb_tbe_dec_ivas_fx(
		Decoder_State st, / i/o: decoder state structure */
		STEREO_ICBWE_DEC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure */
		const Word32 bwe_exc_extended_fx, / i : bandwidth extended excitation : Q_exc */

+440 −114

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1

Original line number	Diff line number	Diff line
		@@ -1068,7 +1068,7 @@ ivas_error ivas_core_dec_fx(
		IF( flaf_swb_tbe )
		{
		/* SWB TBE decoder */
		ivas_swb_tbe_dec_fx( st, hStereoICBWE, bwe_exc_extended_fx[n], st->Q_exc, voice_factors_fx[n], old_syn_12k8_16k_fx[n], tmp_buffer_fx /fb_exc/, hb_synth_32_fx[n], pitch_buf_fx[n], &Q_white_exc );
		swb_tbe_dec_ivas_fx( st, hStereoICBWE, bwe_exc_extended_fx[n], st->Q_exc, voice_factors_fx[n], old_syn_12k8_16k_fx[n], tmp_buffer_fx /fb_exc/, hb_synth_32_fx[n], pitch_buf_fx[n], &Q_white_exc );

		Copy_Scale_sig_16_32_no_sat( hBWE_TD->syn_overlap_fx, hBWE_TD->syn_overlap_fx_32, L_SHB_LAHEAD, sub( Q11, hBWE_TD->prev_Q_bwe_syn2 ) ); // Q11
		Copy_Scale_sig_32_16( hBWE_TD->old_tbe_synth_fx_32, hBWE_TD->old_tbe_synth_fx, L_SHB_TRANSITION_LENGTH, sub( hBWE_TD->prev_Qx, Q11 ) ); // prev_Qx

+2 −2

Original line number	Diff line number	Diff line
		@@ -5648,12 +5648,12 @@ static void find_max_mem_dec_m3(


		/-------------------------------------------------------------------
		* ivas_swb_tbe_dec_fx()
		* swb_tbe_dec_ivas_fx()
		*
		* SWB TBE decoder, 6 - 14 kHz (or 7.5 - 15.5 kHz) band decoding module
		-------------------------------------------------------------------/

		void ivas_swb_tbe_dec_fx(
		void swb_tbe_dec_ivas_fx(
		Decoder_State st, / i/o: decoder state structure */
		STEREO_ICBWE_DEC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure */
		const Word32 bwe_exc_extended_fx, / i : bandwidth extended excitation : Q_exc */

+4 −0

Original line number	Diff line number	Diff line
		@@ -3949,7 +3949,11 @@ void swb_tbe_enc_ivas_fx(
		Q_bwe_exc_fb = hBWE_TD->prev_Q_bwe_exc_fb;
		move16();

		#ifdef HARMONIZE_TBE2
		GenShapedSHBExcitation_ivas_enc_fx( ENC, shaped_shb_excitation_fx + L_SHB_LAHEAD, lpc_shb_fx, White_exc16k_fx, hBWE_TD->mem_csfilt_fx,
		#else
		GenShapedSHBExcitation_ivas_enc_fx( shaped_shb_excitation_fx + L_SHB_LAHEAD, lpc_shb_fx, White_exc16k_fx, hBWE_TD->mem_csfilt_fx,
		#endif
		hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx, st_fx->coder_type, bwe_exc_extended_16, hBWE_TD->bwe_seed,
		vf_modified_fx, st_fx->extl, &( hBWE_TD->tbe_demph_fx ), &( hBWE_TD->tbe_premph_fx ), lpc_shb_sf_fx, shb_ener_sf_Q31,
		shb_res_gshape_fx, shb_res_fx, &vf_ind_fx, formant_fac_fx, hBWE_TD->fb_state_lpc_syn_fx, &( hBWE_TD->fb_tbe_demph_fx ), &Q_bwe_exc,