Revert "fix build errors" (5f65ef06) · Commits · SA4 / Audio / IVAS BASOP

lib_com/prot_fx.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -3259,7 +3259,7 @@ void wb_tbe_extras_reset_synth_fx( Word16 state_lsyn_filt_shb[], Word16 state_ls

		void elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		int isIVAS,
		int isIVAS;
		#endif
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		Word16 IsUpsampled3,

lib_com/swb_tbe_com_fx.c

+140 −163

Original line number	Diff line number	Diff line
		@@ -6872,7 +6872,7 @@ inline static void elliptic_bpf_48k_generic_func1( Word32 input_fx, Word32 L_t

		void elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		int isIVAS,
		int isIVAS;
		#endif
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		Word16 IsUpsampled3,
		@@ -6890,9 +6890,8 @@ void elliptic_bpf_48k_generic_fx(
		Word16 i, j;
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		Word16 memory_fx0, Q_temp, Q_temp2;
		Word32 L_tmp_buffer[L_FRAME48k + 4], L_tmp2_buffer[L_FRAME48k + 4], L_output_buffer[L_FRAME48k + 4];
		Word32 L_tmp_buffer[L_FRAME48k + 4], L_tmp2_buffer[L_FRAME48k + 4], L_output_buffer[L_FRAME48k + 4], L_tmpX;
		Word32 L_tmpMax;
		Word32 L_tmpX;
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		Word64 W_tmpX;
		Word64 W_tmpY;
		@@ -6934,8 +6933,6 @@ void elliptic_bpf_48k_generic_fx(
		IF( !IsUpsampled3 )
		{
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		IF( isIVAS )
		{
		FOR( i = 0; i < L_FRAME48k; i++ )
		{
		/duplicate this into unrolled loopsections in IsUpsampled3-path and dont forget to delete 0-set-input[1,2,4,5,7,8...]/
		@@ -6951,10 +6948,7 @@ void elliptic_bpf_48k_generic_fx(
		L_tmp[i] = W_sat_l( W_shr( W_add( W_tmpX, W_shl( W_tmpY, 2 - 16 + 3 ) ), 3 ) ); /Q_input_fx + 11/
		move32();
		}
		}
		ELSE
		#endif /#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2/
		{
		#else /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2/
		FOR( i = 0; i < L_FRAME48k; i++ )
		{
		L_tmpX = L_shr( L_mult( input_fx[i - 4], full_band_bpf_fx[0][4] ), 3 ); /Q_input_fx + 13 + 1 - 3/
		@@ -6968,13 +6962,11 @@ void elliptic_bpf_48k_generic_fx(
		L_tmp[i] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 4], full_band_bpf_fx[3][4] ), 2 ) ); /Q_input_fx + 11 + 13 -15 +2/
		move32();
		}
		}
		#endif /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2/
		} /IsUpsampled3/
		ELSE
		{
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		IF( isIVAS )
		{
		FOR( i = 0; i < L_FRAME48k; )
		{
		W_tmpX = W_mac_16_16( 0, input_fx[i - 3], full_band_bpf_fx[0][3] );
		@@ -7006,10 +6998,7 @@ void elliptic_bpf_48k_generic_fx(
		move32();
		i++;
		}
		}
		ELSE
		#endif /#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2/
		{
		#else
		FOR( i = 0; i < L_FRAME48k; )
		{
		L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i - 3], full_band_bpf_fx[0][3] ), 3 ), 0 ); /Q_input_fx + 13 + 1 - 3/
		@@ -7038,7 +7027,7 @@ void elliptic_bpf_48k_generic_fx(
		move32();
		i++;
		}
		}
		#endif /#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2/
		} /IsUpsampled3/
		#endif /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1/

		@@ -7119,8 +7108,6 @@ void elliptic_bpf_48k_generic_fx(
		elliptic_bpf_48k_generic_func1( L_tmp, L_tmp2, &full_band_bpf_fx[1], 0, &L_tmpMax );
		#else /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1/
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		IF( isIVAS )
		{
		FOR( i = 0; i < L_FRAME48k; i++ )
		{
		W_tmpX = W_mac_32_16( 0, L_tmp[i - 4], full_band_bpf_fx[1][4] );
		@@ -7136,10 +7123,7 @@ void elliptic_bpf_48k_generic_fx(
		move32();
		L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[i] ) );
		}
		}
		ELSE
		#endif /#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2/
		{
		#else /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2/
		FOR( i = 0; i < L_FRAME48k; i++ )
		{
		L_tmpX = L_shr( Mult_32_16( L_tmp[i - 4], full_band_bpf_fx[1][4] ), 3 ); /Q_input_fx + 11 + 13 - 15 -3/
		@@ -7154,8 +7138,7 @@ void elliptic_bpf_48k_generic_fx(
		move32();
		L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[i] ) );
		}
		}

		#endif /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2/
		#endif /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1/
		#else /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic/
		L_tmpX = L_shr( Mult_32_16( memory2_fx[1][0], full_band_bpf_fx[1][4] ), 3 ); /Q_input_fx + 11 + 13 - 15 -3/
		@@ -7246,8 +7229,6 @@ void elliptic_bpf_48k_generic_fx(
		elliptic_bpf_48k_generic_func1( L_tmp2, L_output, &full_band_bpf_fx[2], 0, &L_tmpMax );
		#else /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1/
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		IF( isIVAS )
		{
		FOR( i = 0; i < L_FRAME48k; i++ )
		{
		W_tmpX = W_mac_32_16( 0, L_tmp2[i - 4], full_band_bpf_fx[2][4] );
		@@ -7263,10 +7244,7 @@ void elliptic_bpf_48k_generic_fx(
		move32();
		L_tmpMax = L_max( L_tmpMax, L_abs( L_output[i] ) );
		}
		}
		ELSE
		#endif /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2/
		{
		#else /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2/
		FOR( i = 0; i < L_FRAME48k; i++ )
		{
		L_tmpX = L_shr( Mult_32_16( L_tmp2[i - 4], full_band_bpf_fx[2][4] ), 3 ); /Q_input_fx + 6 +Q_temp+13 -15 -3 /
		@@ -7284,8 +7262,7 @@ void elliptic_bpf_48k_generic_fx(
		move32();
		L_tmpMax = L_max( L_tmpMax, L_abs( L_output[i] ) );
		}
		}

		#endif /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2/
		#endif /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1/
		#else /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic/
		L_tmpX = L_shr( Mult_32_16( memory2_fx_2[0], full_band_bpf_fx[2][4] ), 3 ); /* Q_input_fx+6 +Q_temp +13 -15 -3 /
		@@ -7457,7 +7434,7 @@ void synthesise_fb_high_band_fx(
		/* for 16kHz ACELP core */
		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		isIVAS,
		isIVAS
		#endif
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		1, // IsUpsampled3
		@@ -7471,7 +7448,7 @@ void synthesise_fb_high_band_fx(
		/* for 12.8kHz ACELP core */
		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		isIVAS,
		isIVAS
		#endif
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		1, // IsUpsampled3

lib_dec/swb_tbe_dec_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4723,7 +4723,7 @@ void fb_tbe_dec_ivas_fx(
		synthesise_fb_high_band_fx( fb_exc, Q_fb_exc, fb_synth, fb_exc_energy, ratio, st->L_frame, st->bfi, &( hBWE_TD->prev_fbbwe_ratio_fx ), hBWE_TD->fbbwe_hpf_mem_fx, hBWE_TD->fbbwe_hpf_mem_fx_Q, hb_synth_exp
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		,
		1 /isIVAS/
		Word16 1 /isIVAS/
		#endif
		);
		pop_wmops(); /push_wmops( "synthesise_fb_high_band" );/

lib_enc/swb_tbe_enc_fx.c

+3 −3

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

		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		0, // isIVAS - is this correct?
		0 // isIVAS - is this correct?
		#endif
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		0, // IsUpsampled3
		@@ -7468,7 +7468,7 @@ void fb_tbe_enc_ivas_fx(
		{
		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		1, // isIVAS - is this corret?
		1 // isIVAS - is this corret?
		#endif
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		0, // IsUpsampled3
		@@ -7479,7 +7479,7 @@ void fb_tbe_enc_ivas_fx(
		{
		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		1, // isIVAS - is this correct?
		1 // isIVAS - is this correct?
		#endif
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		0, // IsUpsampled3

lib_com/options.h

+1 −1

File changed.

Contains only whitespace changes.