HARM_BWE (d184787e) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -1865,6 +1865,7 @@ void stereoFdCngCoherence_fx(
		Word16 fft_exp
		);

		#ifndef HARM_BWE
		void ivas_wb_tbe_dec_fx(
		Decoder_State st_fx, / i/o: decoder state structure */
		const Word16 coder_type, /* i : coding type */
		@@ -1874,7 +1875,7 @@ void ivas_wb_tbe_dec_fx(
		Word16 synth, / o : WB synthesis/final synthesis */
		Word16 *Q_synth
		);

		#endif
		void GenShapedWBExcitation_ivas_fx(
		Word16 excSHB, / o : synthesized shaped shb exctiation Q_bwe_exc*/
		const Word16 lpc_shb, / i : lpc coefficients Q12 */

+1 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@
		#define FIX_2319_CLDFB_INIT_FLAGS /* FhG: basop issue 2319: init hs->flags during openCldfb(), to avoid reading of uninitialized memory */
		#define FIX_BASOP_2357_OBJECT_EDIT_MSAN /* Nokia: basop issue 2357: initialize missing exponents in object edit */
		#define FIX_BASOP_2354_MSAN_DIFF_Q_VALUE /* Nokia: Initialize Q value of diffuseness in rendering to Q30 */
		#define HARM_BWE

		/* #################### End BE switches ################################## */

+5 −0

Original line number	Diff line number	Diff line
		@@ -5789,6 +5789,7 @@ void ivas_dequantizeSHBparams_fx_9_1(
		Word16 *MSFlag );

		void fb_tbe_dec_fx(
		#ifndef HARM_BWE
		Decoder_State st, / i/o: encoder state structure */
		const Word16 fb_exc[], /* i : FB excitation from the SWB part */
		Word16 Q_fb_exc,
		@@ -5796,9 +5797,13 @@ void fb_tbe_dec_fx(
		Word16 hb_synth_exp );

		void fb_tbe_dec_ivas_fx(
		#endif
		Decoder_State st, / i/o: encoder state structure */
		const Word16 fb_exc[], /* i : FB excitation from the SWB part */
		Word16 Q_fb_exc,
		#ifdef HARM_BWE
		Word16 hb_synth16, / o : high-band synthesis Q(15 - hb_synth_exp) */
		#endif
		Word32 hb_synth, / o : high-band synthesis */
		Word16 hb_synth_exp,
		Word16 *fb_synth_ref,

+8 −0

Original line number	Diff line number	Diff line
		@@ -408,7 +408,11 @@ ivas_error evs_dec_fx(
		test();
		IF( EQ_16( output_frame, L_FRAME48k ) && EQ_16( st_fx->extl, FB_TBE ) )
		{
		#ifdef HARM_BWE
		fb_tbe_dec_fx( st_fx, fb_exc_fx, Q_fb_exc, hb_synth_fx, NULL, hb_synth_fx_exp, NULL, -1, output_frame );
		#else
		fb_tbe_dec_fx( st_fx, fb_exc_fx, Q_fb_exc, hb_synth_fx, hb_synth_fx_exp );
		#endif
		}
		}
		ELSE IF( EQ_16( st_fx->extl, SWB_BWE ) \|\| EQ_16( st_fx->extl, FB_BWE ) \|\|
		@@ -843,7 +847,11 @@ ivas_error evs_dec_fx(
		test();
		IF( EQ_16( st_fx->extl, FB_TBE ) && EQ_16( output_frame, L_FRAME48k ) )
		{
		#ifdef HARM_BWE
		fb_tbe_dec_fx( st_fx, fb_exc_fx, Q_fb_exc, hb_synth_fx, NULL, hb_synth_fx_exp, NULL, -1, output_frame );
		#else
		fb_tbe_dec_fx( st_fx, fb_exc_fx, Q_fb_exc, hb_synth_fx, hb_synth_fx_exp );
		#endif
		}
		}
		Copy( hb_synth_fx, hBWE_TD->old_hb_synth_fx, output_frame ); /Q15 - hb_synth_fx_exp/

+9 −0

Original line number	Diff line number	Diff line
		@@ -1013,7 +1013,11 @@ ivas_error ivas_core_dec_fx(
		IF( EQ_16( st->extl, WB_TBE ) )
		{
		/* WB TBE decoder */
		#ifdef HARM_BWE
		wb_tbe_dec_fx( st, st->coder_type, bwe_exc_extended_fx[n], st->Q_exc, voice_factors_fx[n], hb_synth_16_fx[n], &Q_hb_synth_fx );
		#else
		ivas_wb_tbe_dec_fx( st, st->coder_type, bwe_exc_extended_fx[n], st->Q_exc, voice_factors_fx[n], hb_synth_16_fx[n], &Q_hb_synth_fx );
		#endif
		}
		ELSE IF( EQ_16( st->element_mode, IVAS_CPE_TD ) && EQ_16( n, 1 ) && !tdm_LRTD_flag && NE_16( st->extl, -1 ) && st->bws_cnt == 0 && st->extl_brate == 0 )
		{
		@@ -1077,7 +1081,12 @@ ivas_error ivas_core_dec_fx(
		/* FB TBE decoder */
		IF( EQ_16( st->extl, FB_TBE ) )
		{
		#ifdef HARM_BWE
		fb_tbe_dec_fx( st, tmp_buffer_fx /fb_exc/, Q_white_exc, NULL, hb_synth_32_fx[n], 0, tmp_buffer_fx /fb_synth_ref/, Q_white_exc, output_frame );
		#else

		fb_tbe_dec_ivas_fx( st, tmp_buffer_fx /fb_exc/, Q_white_exc, hb_synth_32_fx[n], 0, tmp_buffer_fx /fb_synth_ref/, Q_white_exc, output_frame );
		#endif
		}
		}
		ELSE IF( EQ_16( st->extl, SWB_BWE ) \|\| EQ_16( st->extl, FB_BWE ) \|\| flag_bwe_bws )