Commit 74d86e35 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

deactivate upsampled3

parent 6dcde353

lib_com/swb_tbe_com_fx.c

+23 −23
Original line number Diff line number Diff line
@@ -6716,6 +6716,10 @@ void elliptic_bpf_48k_generic_fx( 
    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], L_tmpX;

    Word32 L_tmpMax = L_add( 0, 0 );

#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2

    Word64 W_tmpX;

    Word64 W_tmpY;

#endif



    Word32 *L_tmp = &L_tmp_buffer[4];

    Word32 *L_tmp2 = &L_tmp2_buffer[4];
@@ -6746,11 +6750,12 @@ void elliptic_bpf_48k_generic_fx( 
    }



#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic

#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2

    IF( 1 /* !IsUpsampled3*/ )

    {

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

        {

        Word64 W_tmpX;

        Word64 W_tmpY;

#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2

          /*duplicate this into unrolled loopsections in IsUpsampled3-path and dont forget to delete 0-set-input[1,2,4,5,7,8...]*/

            W_tmpX = W_mac_16_16( 0, input_fx[i - 4], full_band_bpf_fx[0][4] );

            W_tmpX = W_mac_16_16( W_tmpX, input_fx[i - 3], full_band_bpf_fx[0][3] );

            W_tmpY = W_msu_32_16( 0, L_tmp[i - 1], full_band_bpf_fx[3][1] );
@@ -6762,12 +6767,7 @@ void elliptic_bpf_48k_generic_fx( 
            W_tmpY = W_msu_32_16( W_tmpY, L_tmp[i - 4], full_band_bpf_fx[3][4] );

            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

    IF( !IsUpsampled3 )

    {

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

        {

#else /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/

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

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

            L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_tmp[i - 1], full_band_bpf_fx[3][1] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/
@@ -6778,6 +6778,7 @@ void elliptic_bpf_48k_generic_fx( 
            L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i], full_band_bpf_fx[0][0] ), 3 ), L_tmpX );            /*Q_input_fx + 13 + 1 - 3*/

            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*/

        }

    }

    ELSE
@@ -6821,8 +6822,7 @@ void elliptic_bpf_48k_generic_fx( 
            i++;

        }

    }

#endif

#else

#else /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic*/

    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*/

    L_tmpX = L_add( L_shr( L_mult( memory_fx[0][2], full_band_bpf_fx[0][2] ), 3 ), L_tmpX );            /*Q_input_fx + 13 + 1 - 3*/
@@ -6881,7 +6881,7 @@ 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

#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic*/



    memory_fx2[0][0] = input_fx[L_FRAME48k - 4];

    memory_fx2[0][1] = input_fx[L_FRAME48k - 3];