Commit 4bd70976 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

delete memory2_fx[]

parent 8ea93bb6

lib_com/swb_tbe_com_fx.c

+11 −12
Original line number Diff line number Diff line
@@ -6714,7 +6714,6 @@ void elliptic_bpf_48k_generic_fx( 


    Word32 *L_tmp = &L_tmp_buffer[4];

    Word32 *L_tmp2 = &L_tmp2_buffer[4];

    Word32 *memory2_fx[3] = { NULL, &L_tmp[-4], &L_tmp2[-4] };

    Word16 *memory_fx = &input_fx[-4];

#else

    Word16 memory_fx0[4][4], memory_fx[4][4], Q_temp, Q_temp2;
@@ -6732,7 +6731,7 @@ void elliptic_bpf_48k_generic_fx( 
        memory_fx[0][i] = shl_sat( memory_fx0[0][i], sub( *Q_input_fx, memory_fx_Q[0] ) );

#endif

        L_tmp[i - 4] = L_shl_sat( memory_fx2[1][i], sub( add( *Q_input_fx, 11 ), memory_fx_Q[1] ) );

        memory2_fx[2][i] = L_shl_sat( memory_fx2[2][i], sub( add( *Q_input_fx, 6 ), memory_fx_Q[2] ) );

        L_tmp2[i - 4] = L_shl_sat( memory_fx2[2][i], sub( add( *Q_input_fx, 6 ), memory_fx_Q[2] ) );

        // memory2_fx[3][i] = L_shl_sat( memory_fx2[3][i], sub( add( *Q_input_fx, 1 ), memory_fx_Q[3] ) );

        move32();

        move32();
@@ -6908,10 +6907,10 @@ void elliptic_bpf_48k_generic_fx( 
    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[2 - 4], full_band_bpf_fx[1][2] ), 3 ), L_tmpX );                /*Q_input_fx + 11 + 13 - 15 -3*/

    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[3 - 4], full_band_bpf_fx[1][1] ), 3 ), L_tmpX );                /*Q_input_fx + 11 + 13 - 15 -3*/

    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[0], full_band_bpf_fx[1][0] ), 3 ), L_tmpX );                    /*Q_input_fx + 11 + 13 - 15 -3*/

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][3], full_band_bpf_fx[4][1] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][2], full_band_bpf_fx[4][2] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2*/

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][1], full_band_bpf_fx[4][3] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2*/

    L_tmp2[0] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][0], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2*/

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[3 - 4], full_band_bpf_fx[4][1] ), 2 ) );       /*Q_input_fx + 6 +13 -15 +2 */

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[2 - 4], full_band_bpf_fx[4][2] ), 2 ) );       /*Q_input_fx + 6 +13 -15 +2*/

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[1 - 4], full_band_bpf_fx[4][3] ), 2 ) );       /*Q_input_fx + 6 +13 -15 +2*/

    L_tmp2[0] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[0 - 4], full_band_bpf_fx[4][4] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2*/

    move32();

    L_tmpMax = L_abs( L_tmp2[0] );

    L_tmpX = L_shr( Mult_32_16( L_tmp[1 - 4], full_band_bpf_fx[1][4] ), 3 );                                 /*Q_input_fx + 11 + 13 - 15 -3*/
@@ -6920,9 +6919,9 @@ void elliptic_bpf_48k_generic_fx( 
    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[0], full_band_bpf_fx[1][1] ), 3 ), L_tmpX );                    /*Q_input_fx + 11 + 13 - 15 -3*/

    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[1], full_band_bpf_fx[1][0] ), 3 ), L_tmpX );                    /*Q_input_fx + 11 + 13 - 15 -3*/

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[0], full_band_bpf_fx[4][1] ), 2 ) );           /*Q_input_fx + 6 +13 -15 +2 */

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][3], full_band_bpf_fx[4][2] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][2], full_band_bpf_fx[4][3] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */

    L_tmp2[1] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][1], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2 */

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[3 - 4], full_band_bpf_fx[4][2] ), 2 ) );       /*Q_input_fx + 6 +13 -15 +2 */

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[2 - 4], full_band_bpf_fx[4][3] ), 2 ) );       /*Q_input_fx + 6 +13 -15 +2 */

    L_tmp2[1] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[1 - 4], full_band_bpf_fx[4][4] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */

    move32();

    L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[1] ) );

    L_tmpX = L_shr( Mult_32_16( L_tmp[2 - 4], full_band_bpf_fx[1][4] ), 3 );                                 /*Q_input_fx + 11 + 13 - 15 -3*/
@@ -6932,8 +6931,8 @@ void elliptic_bpf_48k_generic_fx( 
    L_tmpX = L_add( L_shr( Mult_32_16( L_tmp[2], full_band_bpf_fx[1][0] ), 3 ), L_tmpX );                    /*Q_input_fx + 11 + 13 - 15 -3*/

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[1], full_band_bpf_fx[4][1] ), 2 ) );           /*Q_input_fx + 6 +13 -15 +2 */

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[0], full_band_bpf_fx[4][2] ), 2 ) );           /*Q_input_fx + 6 +13 -15 +2 */

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][3], full_band_bpf_fx[4][3] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */

    L_tmp2[2] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][2], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2 */

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[3 - 4], full_band_bpf_fx[4][3] ), 2 ) );       /*Q_input_fx + 6 +13 -15 +2 */

    L_tmp2[2] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[2 - 4], full_band_bpf_fx[4][4] ), 2 ) );    /*Q_input_fx + 6 +13 -15 +2 */

    move32();

    L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[2] ) );

    L_tmpX = L_shr( Mult_32_16( L_tmp[3 - 4], full_band_bpf_fx[1][4] ), 3 );                                                                /*Q_input_fx + 11 + 13 - 15 -3*/
@@ -6944,7 +6943,7 @@ void elliptic_bpf_48k_generic_fx( 
    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[2], full_band_bpf_fx[4][1] ), 2 ) );                                          /*Q_input_fx + 6 +13 -15 +2 */

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[1], full_band_bpf_fx[4][2] ), 2 ) );                                          /*Q_input_fx + 6 +13 -15 +2 */

    L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[0], full_band_bpf_fx[4][3] ), 2 ) );                                          /*Q_input_fx + 6 +13 -15 +2 */

    L_tmp2[3] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx[2][3], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2 */ /*14 + Q_input_fx - shift_flag*/

    L_tmp2[3] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp2[3 - 4], full_band_bpf_fx[4][4] ), 2 ) ); /*Q_input_fx + 6 +13 -15 +2 */    /*14 + Q_input_fx - shift_flag*/

    move32();

    L_tmpMax = L_max( L_tmpMax, L_abs( L_tmp2[3] ) );

    FOR( i = 4; i < L_FRAME48k; i++ )