Commit da263e0a authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Revert "make upsampled work again - select only for correct filters" 

This reverts commit 3ad6e7e5.
parent adaae746

lib_com/swb_tbe_com_fx.c

+11 −25
Original line number Diff line number Diff line
@@ -6859,10 +6859,6 @@ void elliptic_bpf_48k_generic_fx( 
    }

    ELSE

#endif /*FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig*/

    

#ifdef FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig

        test();

    IF( full_band_bpf_fx == full_band_bpf_3_fx || full_band_bpf_fx == full_band_bpf_1_fx )

    {

#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic

        FOR( i = 0; i < L_FRAME48k; i++ )
@@ -6870,6 +6866,7 @@ void elliptic_bpf_48k_generic_fx( 
        FOR( i = 4; i < L_FRAME48k; i++ )

#endif

        {

#ifdef FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig

            //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 ), 0 );               /*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*/
@@ -6880,17 +6877,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();

        }

    }

    ELSE

#endif /*FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig*/

    {

#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic

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

#else

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

#endif

        {

            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*/
@@ -6901,11 +6888,10 @@ 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

        }

    }







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

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

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