replace memory2_fx_2 with Ltmp2[-4] and delete memory2_fx_2 (1523048c) · Commits · SA4 / Audio / IVAS BASOP

lib_com/swb_tbe_com_fx.c

+13 −12

Original line number	Diff line number	Diff line
		@@ -6711,14 +6711,15 @@ void elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_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[L_FRAME48k], L_tmpX, L_tmpMax;
		Word32 memory2_fx_3[4];

		Word32 *L_tmp = &L_tmp_buffer[4];
		Word32 *L_tmp2 = &L_tmp2_buffer[4];
		#else
		Word16 memory_fx0[4][4], memory_fx[4][4], Q_temp, Q_temp2;
		Word32 L_tmp[L_FRAME48k], L_tmp2[L_FRAME48k], L_output[L_FRAME48k], L_tmpX, memory2_fx[4][4], L_tmpMax;
		#endif
		Word32 memory2_fx_2[4], memory2_fx_3[4];
		#endif

		FOR( i = 0; i < 4; i++ )
		{
		@@ -6975,16 +6976,16 @@ void elliptic_bpf_48k_generic_fx(
		move32();
		FOR( j = 0; j < 4; j++ )
		{
		memory2_fx_2[j] = L_shl_sat( memory_fx2[2][j], sub( add( add( *Q_input_fx, 6 ), Q_temp ), memory_fx_Q[2] ) );
		L_tmp2[j - 4] = L_shl_sat( memory_fx2[2][j], sub( add( add( *Q_input_fx, 6 ), Q_temp ), memory_fx_Q[2] ) );
		memory2_fx_3[j] = L_shl_sat( memory_fx2[3][j], sub( add( add( *Q_input_fx, 1 ), Q_temp ), memory_fx_Q[3] ) );
		move32();
		move32();
		move32();
		}
		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 /
		L_tmpX = L_add_sat( L_shr( Mult_32_16( memory2_fx_2[1], full_band_bpf_fx[2][3] ), 3 ), L_tmpX ); /Q_input_fx + 6 +Q_temp+13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( memory2_fx_2[2], full_band_bpf_fx[2][2] ), 3 ), L_tmpX ); /Q_input_fx + 6 +Q_temp+13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( memory2_fx_2[3], full_band_bpf_fx[2][1] ), 3 ), L_tmpX ); /Q_input_fx + 6 +Q_temp+13 -15 -3/
		L_tmpX = L_shr( Mult_32_16( L_tmp2[0 - 4], full_band_bpf_fx[2][4] ), 3 ); /* Q_input_fx+6 +Q_temp +13 -15 -3 /
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[1 - 4], full_band_bpf_fx[2][3] ), 3 ), L_tmpX ); /Q_input_fx + 6 +Q_temp+13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[2 - 4], full_band_bpf_fx[2][2] ), 3 ), L_tmpX ); /Q_input_fx + 6 +Q_temp+13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[3 - 4], full_band_bpf_fx[2][1] ), 3 ), L_tmpX ); /Q_input_fx + 6 +Q_temp+13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[0], full_band_bpf_fx[2][0] ), 3 ), L_tmpX ); /Q_input_fx + 6 +Q_temp+13 -15 -3/
		L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx_3[3], full_band_bpf_fx[5][1] ), 2 ) ); /Q_input_fx + 1 +Q_temp+13 -15 + 2 /
		L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx_3[2], full_band_bpf_fx[5][2] ), 2 ) ); /Q_input_fx + 1 +Q_temp+13 -15 + 2 /
		@@ -6993,9 +6994,9 @@ void elliptic_bpf_48k_generic_fx(
		move32();
		L_tmpMax = L_abs( L_output[0] );

		L_tmpX = L_shr( Mult_32_16( memory2_fx_2[1], full_band_bpf_fx[2][4] ), 3 ); /Q_input_fx + 6 +Q_temp +13 -15 -3 /
		L_tmpX = L_add_sat( L_shr( Mult_32_16( memory2_fx_2[2], full_band_bpf_fx[2][3] ), 3 ), L_tmpX ); /Q_input_fx +Q_temp+ 6 +13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( memory2_fx_2[3], full_band_bpf_fx[2][2] ), 3 ), L_tmpX ); /Q_input_fx +Q_temp+ 6 +13 -15 -3/
		L_tmpX = L_shr( Mult_32_16( L_tmp2[1 - 4], full_band_bpf_fx[2][4] ), 3 ); /Q_input_fx + 6 +Q_temp +13 -15 -3 /
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[2 - 4], full_band_bpf_fx[2][3] ), 3 ), L_tmpX ); /Q_input_fx +Q_temp+ 6 +13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[3 - 4], full_band_bpf_fx[2][2] ), 3 ), L_tmpX ); /Q_input_fx +Q_temp+ 6 +13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[0], full_band_bpf_fx[2][1] ), 3 ), L_tmpX ); /Q_input_fx +Q_temp+ 6 +13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[1], full_band_bpf_fx[2][0] ), 3 ), L_tmpX ); /Q_input_fx+Q_temp + 6 +13 -15 -3/
		L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_output[0], full_band_bpf_fx[5][1] ), 2 ) ); /Q_input_fx + 1 +13 -15 + 2+Q_temp/
		@@ -7005,8 +7006,8 @@ void elliptic_bpf_48k_generic_fx(
		move32();
		L_tmpMax = L_max( L_tmpMax, L_abs( L_output[1] ) );

		L_tmpX = L_shr( Mult_32_16( memory2_fx_2[2], full_band_bpf_fx[2][4] ), 3 ); /Q_input_fx + 6 +Q_temp+13 -15 -3 /
		L_tmpX = L_add_sat( L_shr( Mult_32_16( memory2_fx_2[3], full_band_bpf_fx[2][3] ), 3 ), L_tmpX ); /Q_input_fx +Q_temp+ 6 +13 -15 -3/
		L_tmpX = L_shr( Mult_32_16( L_tmp2[2 - 4], full_band_bpf_fx[2][4] ), 3 ); /Q_input_fx + 6 +Q_temp+13 -15 -3 /
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[3 - 4], full_band_bpf_fx[2][3] ), 3 ), L_tmpX ); /Q_input_fx +Q_temp+ 6 +13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[0], full_band_bpf_fx[2][2] ), 3 ), L_tmpX ); /Q_input_fx +Q_temp+ 6 +13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[1], full_band_bpf_fx[2][1] ), 3 ), L_tmpX ); /Q_input_fx +Q_temp + 6 +13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[2], full_band_bpf_fx[2][0] ), 3 ), L_tmpX ); /Q_input_fx +Q_temp + 6 +13 -15 -3/
		@@ -7017,7 +7018,7 @@ void elliptic_bpf_48k_generic_fx(
		move32();
		L_tmpMax = L_max( L_tmpMax, L_abs( L_output[2] ) );

		L_tmpX = L_shr( Mult_32_16( memory2_fx_2[3], full_band_bpf_fx[2][4] ), 3 ); /Q_input_fx + 6 +Q_temp +13 -15 -3 /
		L_tmpX = L_shr( Mult_32_16( L_tmp2[3 - 4], full_band_bpf_fx[2][4] ), 3 ); /Q_input_fx + 6 +Q_temp +13 -15 -3 /
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[0], full_band_bpf_fx[2][3] ), 3 ), L_tmpX ); /Q_input_fx + 6 +Q_temp+13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[1], full_band_bpf_fx[2][2] ), 3 ), L_tmpX ); /Q_input_fx + 6 +Q_temp+13 -15 -3/
		L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[2], full_band_bpf_fx[2][1] ), 3 ), L_tmpX ); /Q_input_fx + 6 +Q_temp+13 -15 -3/