Commit 8bf813ae authored by Fabian Bauer's avatar Fabian Bauer
Browse files

replace memory_fx by input_fx[-4] and delete memory_fx

parent 2e44a40e

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];

    Word16 *memory_fx = &input_fx[-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;
@@ -6725,7 +6724,7 @@ void elliptic_bpf_48k_generic_fx( 
    {

#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic

        memory_fx0 = extract_l( memory_fx2[0][i] );

        memory_fx[i] = shl_sat( memory_fx0, sub( *Q_input_fx, memory_fx_Q[0] ) );

        input_fx[i - 4] = shl_sat( memory_fx0, sub( *Q_input_fx, memory_fx_Q[0] ) );

#else

        memory_fx0[0][i] = extract_l( memory_fx2[0][i] );

        memory_fx[0][i] = shl_sat( memory_fx0[0][i], sub( *Q_input_fx, memory_fx_Q[0] ) );
@@ -6741,10 +6740,10 @@ void elliptic_bpf_48k_generic_fx( 
    }



#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic

    L_tmpX = L_shr( L_mult( memory_fx[0], full_band_bpf_fx[0][4] ), 3 );                  /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( memory_fx[1], full_band_bpf_fx[0][3] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( memory_fx[2], full_band_bpf_fx[0][2] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( memory_fx[3], full_band_bpf_fx[0][1] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_shr( L_mult( input_fx[0 - 4], full_band_bpf_fx[0][4] ), 3 );               /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( input_fx[1 - 4], full_band_bpf_fx[0][3] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( input_fx[2 - 4], full_band_bpf_fx[0][2] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( input_fx[3 - 4], full_band_bpf_fx[0][1] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/

#else

    L_tmpX = L_shr( L_mult( memory_fx[0][0], full_band_bpf_fx[0][4] ), 3 );                  /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][1], full_band_bpf_fx[0][3] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/
@@ -6760,9 +6759,9 @@ void elliptic_bpf_48k_generic_fx( 
    move32();



#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic

    L_tmpX = L_shr( L_mult( memory_fx[1], full_band_bpf_fx[0][4] ), 3 );                  /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( memory_fx[2], full_band_bpf_fx[0][3] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( memory_fx[3], full_band_bpf_fx[0][2] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_shr( L_mult( input_fx[1 - 4], full_band_bpf_fx[0][4] ), 3 );               /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( input_fx[2 - 4], full_band_bpf_fx[0][3] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( input_fx[3 - 4], full_band_bpf_fx[0][2] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/

#else

    L_tmpX = L_shr( L_mult( memory_fx[0][1], full_band_bpf_fx[0][4] ), 3 );                  /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][2], full_band_bpf_fx[0][3] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/
@@ -6777,8 +6776,8 @@ void elliptic_bpf_48k_generic_fx( 
    move32();



#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic

    L_tmpX = L_shr( L_mult( memory_fx[2], full_band_bpf_fx[0][4] ), 3 );                  /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( memory_fx[3], full_band_bpf_fx[0][3] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_shr( L_mult( input_fx[2 - 4], full_band_bpf_fx[0][4] ), 3 );               /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( input_fx[3 - 4], full_band_bpf_fx[0][3] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/

#else

    L_tmpX = L_shr( L_mult( memory_fx[0][2], full_band_bpf_fx[0][4] ), 3 );                  /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][3], full_band_bpf_fx[0][3] ), 3 ), L_tmpX ); /*Q_input_fx + 13 + 1 - 3*/
@@ -6793,7 +6792,7 @@ void elliptic_bpf_48k_generic_fx( 
    move32();



#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic

    L_tmpX = L_shr( L_mult( memory_fx[3], full_band_bpf_fx[0][4] ), 3 ); /*Q_input_fx + 13 + 1 - 3*/

    L_tmpX = L_shr( L_mult( input_fx[3 - 4], full_band_bpf_fx[0][4] ), 3 ); /*Q_input_fx + 13 + 1 - 3*/

#else

    L_tmpX = L_shr( L_mult( memory_fx[0][3], full_band_bpf_fx[0][4] ), 3 );                  /*Q_input_fx + 13 + 1 - 3*/

#endif