Commit 71be43e7 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

fix STAGE2

parent 69d20695

lib_com/swb_tbe_com_fx.c

+163 −141
Original line number Diff line number Diff line
@@ -6762,6 +6762,8 @@ void elliptic_bpf_48k_generic_fx( 
    IF( !IsUpsampled3 )

    {

#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2

        IF( isIVAS )

        {

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

            {

                /*duplicate this into unrolled loopsections in IsUpsampled3-path and dont forget to delete 0-set-input[1,2,4,5,7,8...]*/
@@ -6777,7 +6779,10 @@ void elliptic_bpf_48k_generic_fx( 
                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  /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/

        }

        ELSE

#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/

        {

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

            {

                L_tmpX = L_shr( L_mult( input_fx[i - 4], full_band_bpf_fx[0][4] ), 3 );                             /*Q_input_fx + 13 + 1 - 3*/
@@ -6791,11 +6796,13 @@ 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 /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/

        }

    } /*IsUpsampled3*/

    ELSE

    {

#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2

        IF( isIVAS )

        {

            FOR( i = 0; i < L_FRAME48k; )

            {

                W_tmpX = W_mac_16_16( 0, input_fx[i - 3], full_band_bpf_fx[0][3] );
@@ -6827,7 +6834,10 @@ void elliptic_bpf_48k_generic_fx( 
                move32();

                i++;

            }

#else

        }

        ELSE

#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/

        {

            FOR( i = 0; i < L_FRAME48k; )

            {

                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*/
@@ -6856,7 +6866,8 @@ void elliptic_bpf_48k_generic_fx( 
                move32();

                i++;

            }

#endif /*#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/

        }



    } /*IsUpsampled3*/



#else  /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic*/
@@ -6930,6 +6941,8 @@ void elliptic_bpf_48k_generic_fx( 
#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic

    L_tmpMax = L_add( 0, 0 );

#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2

    IF( isIVAS )

    {

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

        {

            W_tmpX = W_mac_32_16( 0, L_tmp[i - 4], full_band_bpf_fx[1][4] );
@@ -6945,7 +6958,10 @@ void elliptic_bpf_48k_generic_fx( 
            move32();

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

        }

#else  /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/

    }

    ELSE

#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/

    {

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

        {

            L_tmpX = L_shr( Mult_32_16( L_tmp[i - 4], full_band_bpf_fx[1][4] ), 3 );                              /*Q_input_fx + 11 + 13 - 15 -3*/
@@ -6960,7 +6976,7 @@ void elliptic_bpf_48k_generic_fx( 
            move32();

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

        }

#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/

    }

#else /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic*/

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

    L_tmpX = L_add( L_shr( Mult_32_16( memory2_fx[1][1], full_band_bpf_fx[1][3] ), 3 ), L_tmpX );            /*Q_input_fx + 11 + 13 - 15 -3*/
@@ -7058,6 +7074,8 @@ void elliptic_bpf_48k_generic_fx( 
#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic

    L_tmpMax = L_add( 0, 0 );

#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2

    IF( isIVAS )

    {

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

        {

            W_tmpX = W_mac_32_16( 0, L_tmp2[i - 4], full_band_bpf_fx[2][4] );
@@ -7073,7 +7091,10 @@ void elliptic_bpf_48k_generic_fx( 
            move32();

            L_tmpMax = L_max( L_tmpMax, L_abs( L_output[i] ) );

        }

#else  /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/

    }

    ELSE

#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/

    {

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

        {

            L_tmpX = L_shr( Mult_32_16( L_tmp2[i - 4], full_band_bpf_fx[2][4] ), 3 );                            /*Q_input_fx + 6 +Q_temp+13 -15 -3 */
@@ -7091,7 +7112,8 @@ void elliptic_bpf_48k_generic_fx( 
            move32();

            L_tmpMax = L_max( L_tmpMax, L_abs( L_output[i] ) );

        }

#endif /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2*/

    }



#else  /*FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic*/

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