fix FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW (b6b50406) · Commits · SA4 / Audio / IVAS BASOP

lib_com/prot_fx.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -3264,6 +3264,7 @@ 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[] );

		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW
		void elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		Word16 isIVAS,
		@@ -3280,6 +3281,16 @@ void elliptic_bpf_48k_generic_fx(
		Word16 memory_fx_Q[],
		const Word16 full_band_bpf[][5] /* i : filter coefficients b0,b1,b2,a0,a1,a2 Q13 */
		);
		#else
		void elliptic_bpf_48k_generic_fx(
		const Word16 input_fx[], /* i : i signal Q_input_fx */
		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 */
		Word16 memory_fx_Q[],
		const Word16 full_band_bpf[][5] /* i : filter coefficients b0,b1,b2,a0,a1,a2 Q13 */
		);
		#endif

		void synthesise_fb_high_band_fx(
		const Word16 excitation_in[], /* i : full band excitation */

lib_com/swb_tbe_com_fx.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -7713,6 +7713,7 @@ void synthesise_fb_high_band_fx(
		IF( EQ_16( L_frame, L_FRAME16k ) )
		{
		/* for 16kHz ACELP core */
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW
		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		1, // isIVAS
		@@ -7723,10 +7724,14 @@ void synthesise_fb_high_band_fx(
		excitation_in_interp3, &exp_tmp, tmp, bpf_memory, bpf_memory_Q, full_band_bpf_3_fx

		);
		#else
		elliptic_bpf_48k_generic_fx( excitation_in_interp3, &exp_tmp, tmp, bpf_memory, bpf_memory_Q, full_band_bpf_3_fx );
		#endif
		}
		ELSE
		{
		/* for 12.8kHz ACELP core */
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW
		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		1, // isIVAS
		@@ -7735,6 +7740,9 @@ void synthesise_fb_high_band_fx(
		1, // IsUpsampled3
		#endif
		excitation_in_interp3, &exp_tmp, tmp, bpf_memory, bpf_memory_Q, full_band_bpf_1_fx );
		#else
		elliptic_bpf_48k_generic_fx( excitation_in_interp3, &exp_tmp, tmp, bpf_memory, bpf_memory_Q, full_band_bpf_1_fx );
		#endif
		}
		temp1 = sum2_fx_mod( tmp, L_FRAME48k );

lib_enc/swb_tbe_enc_fx.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -7330,6 +7330,7 @@ void fb_tbe_enc_fx(

		Copy_Scale_sig( new_input, input_fhb, L_FRAME48k, exp_temp );

		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW
		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_TEST_ALLIVAS
		@@ -7342,6 +7343,9 @@ void fb_tbe_enc_fx(
		0, // IsUpsampled3
		#endif
		input_fhb, &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );
		#else
		elliptic_bpf_48k_generic_fx( input_fhb, &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );
		#endif
		Sample_Delay_HP = NS2SA( 48000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) - L_FRAME48k / 2;

		IF( NE_16( st->last_extl, FB_TBE ) )
		@@ -7470,6 +7474,7 @@ void fb_tbe_enc_ivas_fx(

		IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )
		{
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW
		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		1, // isIVAS
		@@ -7478,9 +7483,13 @@ void fb_tbe_enc_ivas_fx(
		0, // IsUpsampled3
		#endif
		input_fhb_new, &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );
		#else
		elliptic_bpf_48k_generic_fx( input_fhb_new, &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );
		#endif
		}
		ELSE
		{
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW
		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		1, // isIVAS
		@@ -7489,6 +7498,9 @@ void fb_tbe_enc_ivas_fx(
		0, // IsUpsampled3
		#endif
		input_fhb_new + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );
		#else
		elliptic_bpf_48k_generic_fx( input_fhb_new + NS2SA( 48000, DELAY_FIR_RESAMPL_NS ), &exp_temp, tmp_vec, hBWE_TD->elliptic_bpf_2_48k_mem_fx, hBWE_TD->elliptic_bpf_2_48k_mem_fx_Q, full_band_bpf_2_fx );
		#endif
		}

		test();