checkin state of BE branch in commit 090be8f3 (e1d19cec) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+14 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,11 @@
		#define FIX_1378_ACELP_OUT_OF_BOUNDS

		/* Note: each compile switch (FIX_1101_...) is independent from the other ones */

		#define DIV32_OPT_NEWTON /* FhG: faster 32 by 32 bit division */
		#define MERGE_REQ


		//#define OPT_STEREO_32KBPS_V1 /* Optimization made in stereo decoding path for 32kbps decoding */
		#define OPT_AVOID_STATE_BUF_RESCALE /* Optimization made to avoid rescale of synth state buffer */
		#define FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx /FhG: WMOPS tuning, nonbe/
		@@ -84,4 +89,13 @@
		//#define HARM_SCE_INIT
		#define DIV32_OPT_NEWTON /* FhG: faster 32 by 32 bit division */
		#define MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of Cy calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Obsoletes IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE. */
		#define FIX_1439_SPEEDUP_Copy_Scale_sig_16_32_no_sat /FhG: reduces WMOPS - bit-exact/
		#define FIX_1439_SPEEDUP_stereo_icBWE_dec_fx /FhG: reduces WMOPS - bit-exact/
		#define FIX_1439_SPEEDUP_ivas_swb_tbe_dec_fx /FhG: reduces WMOPS - bit-exact/
		#define FIX_1439_SPEEDUP_synthesise_fb_high_band_fx /FhG: reduces WMOPS - bit-exact/

		#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic /FhG: reduces maintenance complexity & reduces WMOPS & prepares STAGE2 patch/
		//#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2 /FhG: reduces WMOPS /
		//#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1

		#endif

lib_com/prot_fx.h

+9 −1

Original line number	Diff line number	Diff line
		@@ -3258,7 +3258,15 @@ void interp_code_4over2_fx(
		void wb_tbe_extras_reset_synth_fx( Word16 state_lsyn_filt_shb[], Word16 state_lsyn_filt_dwn_shb[], Word16 state_32and48k_WB_upsample[], Word16 state_resamp_HB[] );

		void elliptic_bpf_48k_generic_fx(
		const Word16 input_fx[], /* i : i signal Q_input_fx */
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		int isIVAS;
		#endif
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		Word16 IsUpsampled3,
		Word16 input_fx[], /* i : input signal Q_input_fx*/
		#else
		const Word16 input_fx[], /* i : input signal Q_input_fx*/
		#endif
		Word16 *Q_input_fx,
		Word16 output_fx[], /* o : output signal */
		Word32 memory_fx[][4], /* i/o: 4 arrays of 4 for memory memory_fx_Q */

lib_com/swb_tbe_com_fx.c

+520 −53

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/tools_fx.c

+25 −1

Original line number	Diff line number	Diff line
		@@ -794,14 +794,38 @@ void Copy_Scale_sig_16_32_no_sat(
		}
		return;
		}
		#ifdef FIX_1439_SPEEDUP_Copy_Scale_sig_16_32_no_sat
		L_tmp = L_shl_o( 1, exp0 - 1, &Overflow );

		IF( L_tmp >= 0x7FFF )
		{
		FOR( i = 0; i < lg; i++ )
		{
		// y[i] = L_mult0(x[i], L_tmp);
		y[i] = W_extract_l( W_mult_32_16( L_tmp, x[i] ) );
		move32(); /* saturation can occur here */
		move32(); /* Overflow can occur here */
		}
		return;
		}
		// ELSE
		{
		Word16 tmp = extract_l( L_tmp );
		FOR( i = 0; i < lg; i++ )
		{
		y[i] = L_mult( x[i], tmp );
		move32();
		}
		}
		#else
		L_tmp = L_shl_o( 1, exp0 - 1, &Overflow );
		FOR( i = 0; i < lg; i++ )
		{
		// y[i] = L_mult0(x[i], L_tmp);
		y[i] = W_extract_l( W_mult_32_16( L_tmp, x[i] ) );
		move32(); /* Overflow can occur here */
		}
		#endif
		}

		void Copy_Scale_sig_32_16(
		const Word32 x[], /* i : signal to scale input Qx */

lib_dec/ivas_stereo_icbwe_dec_fx.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -904,6 +904,9 @@ void stereo_icBWE_dec_fx(
		winSlope_fx = div_s( 1, winLen_fx ); /* Q15 */
		alpha_fx = winSlope_fx; /* Q15 */
		move16();
		#ifdef FIX_1439_SPEEDUP_stereo_icBWE_dec_fx
		Word16 winSlope_fx_ = sub( 32767 /* 1.0 in Q15*/, winSlope_fx );
		#endif
		FOR( i = 0; i < winLen_fx; i++ )
		{
		L_tmp = L_mult0( alpha_fx, icbweM2Ref_fx ); /* Q29 */
		@@ -911,10 +914,17 @@ void stereo_icBWE_dec_fx(
		tmp = shl( round_fx( L_tmp ), 1 ); /* Q14 */
		synthRef_fx[i] = Mpy_32_16_1( synthRef_fx[i], tmp ); /* Qsyn - 1 */
		move32();
		#ifdef FIX_1439_SPEEDUP_stereo_icBWE_dec_fx
		if ( LE_16( alpha_fx, winSlope_fx_ ) )
		{
		alpha_fx = add( alpha_fx, winSlope_fx ); /* Q15 */
		}
		#else
		IF( LE_16( alpha_fx, sub( 32767 /* 1.0 in Q15*/, winSlope_fx ) ) )
		{
		alpha_fx = add( alpha_fx, winSlope_fx ); /* Q15 */
		}
		#endif
		}

		FOR( ; i < NS2SA_FX2( st->output_Fs, FRAME_SIZE_NS ); i++ )