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

Revert "more reintegrating loops and cleaning up - also fix - TBD: make... 

Revert "more reintegrating loops and cleaning up - also fix - TBD: make upsampled work again - select only for correct filters"

This reverts commit efe4596e.
parent da263e0a

lib_com/swb_tbe_com_fx.c

+55 −1
Original line number Diff line number Diff line
@@ -6998,7 +6998,19 @@ void elliptic_bpf_48k_generic_fx( 
        move32();

        move32();

    }

#ifndef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic

#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic

    //L_tmpX = L_shr( Mult_32_16( L_tmp2[0 - 4], 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( L_tmp2[1 - 4], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );            /*Q_input_fx + 6 +Q_temp+13 -15 -3*/

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

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

    //L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[0], full_band_bpf_fx[2][0] ), 3 ), L_tmpX );                /*Q_input_fx + 6 +Q_temp+13 -15 -3*/

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

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

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

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

    //move32();

    //L_tmpMax = L_abs( L_output[0] );

#else

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

    L_tmpX = L_add_sat( L_shr( Mult_32_16( memory2_fx_2[2], full_band_bpf_fx[2][2] ), 3 ), L_tmpX );          /*Q_input_fx + 6 +Q_temp+13 -15 -3*/
@@ -7010,7 +7022,21 @@ void elliptic_bpf_48k_generic_fx( 
    L_output[0] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx_3[0], full_band_bpf_fx[5][4] ), 2 ) ); /*Q_input_fx + 1 +Q_temp+13 -15 + 2 */

    move32();

    L_tmpMax = L_abs( L_output[0] );

#endif



#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic

    //L_tmpX = L_shr( Mult_32_16( L_tmp2[1 - 4], 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( L_tmp2[2 - 4], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );            /*Q_input_fx +Q_temp+ 6 +13 -15 -3*/

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

    //L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[0], full_band_bpf_fx[2][1] ), 3 ), L_tmpX );                /*Q_input_fx +Q_temp+ 6 +13 -15 -3*/

    //L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[1], full_band_bpf_fx[2][0] ), 3 ), L_tmpX );                /*Q_input_fx+Q_temp + 6 +13 -15 -3*/

    //L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_output[0], full_band_bpf_fx[5][1] ), 2 ) );          /*Q_input_fx + 1 +13 -15 + 2+Q_temp*/

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

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

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

    //move32();

    //L_tmpMax = L_max( L_tmpMax, L_abs( L_output[1] ) );

#else

    L_tmpX = L_shr( Mult_32_16( memory2_fx_2[1], 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[2], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );          /*Q_input_fx +Q_temp+ 6 +13 -15 -3*/

    L_tmpX = L_add_sat( L_shr( Mult_32_16( memory2_fx_2[3], full_band_bpf_fx[2][2] ), 3 ), L_tmpX );          /*Q_input_fx +Q_temp+ 6 +13 -15 -3*/
@@ -7022,7 +7048,21 @@ void elliptic_bpf_48k_generic_fx( 
    L_output[1] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx_3[1], full_band_bpf_fx[5][4] ), 2 ) ); /*Q_input_fx + 1 +13 -15 + 2+Q_temp*/

    move32();

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

#endif



#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic

    //L_tmpX = L_shr( Mult_32_16( L_tmp2[2 - 4], 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( L_tmp2[3 - 4], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );            /*Q_input_fx +Q_temp+ 6 +13 -15 -3*/

    //L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[0], full_band_bpf_fx[2][2] ), 3 ), L_tmpX );                /*Q_input_fx +Q_temp+ 6 +13 -15 -3*/

    //L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[1], full_band_bpf_fx[2][1] ), 3 ), L_tmpX );                /*Q_input_fx +Q_temp + 6 +13 -15 -3*/

    //L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[2], full_band_bpf_fx[2][0] ), 3 ), L_tmpX );                /*Q_input_fx +Q_temp + 6 +13 -15 -3*/

    //L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_output[1], full_band_bpf_fx[5][1] ), 2 ) );          /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/

    //L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_output[0], full_band_bpf_fx[5][2] ), 2 ) );          /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/

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

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

    //move32();

    //L_tmpMax = L_max( L_tmpMax, L_abs( L_output[2] ) );

#else

    L_tmpX = L_shr( Mult_32_16( memory2_fx_2[2], 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[3], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );          /*Q_input_fx +Q_temp+ 6 +13 -15 -3*/

    L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[0], full_band_bpf_fx[2][2] ), 3 ), L_tmpX );                /*Q_input_fx +Q_temp+ 6 +13 -15 -3*/
@@ -7034,7 +7074,21 @@ void elliptic_bpf_48k_generic_fx( 
    L_output[2] = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( memory2_fx_3[2], full_band_bpf_fx[5][4] ), 2 ) ); /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/

    move32();

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

#endif



#ifdef FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic

    //L_tmpX = L_shr( Mult_32_16( L_tmp2[3 - 4], 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( L_tmp2[0], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );                /*Q_input_fx + 6 +Q_temp+13 -15 -3*/

    //L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[1], full_band_bpf_fx[2][2] ), 3 ), L_tmpX );                /*Q_input_fx + 6 +Q_temp+13 -15 -3*/

    //L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[2], full_band_bpf_fx[2][1] ), 3 ), L_tmpX );                /*Q_input_fx + 6 +Q_temp+13 -15 -3*/

    //L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[3], full_band_bpf_fx[2][0] ), 3 ), L_tmpX );                /*Q_input_fx + 6 +Q_temp+13 -15 -3*/

    //L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_output[2], full_band_bpf_fx[5][1] ), 2 ) );          /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/

    //L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_output[1], full_band_bpf_fx[5][2] ), 2 ) );          /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/

    //L_tmpX = L_sub_sat( L_tmpX, L_shl_sat( Mult_32_16( L_output[0], full_band_bpf_fx[5][3] ), 2 ) );          /*Q_input_fx + 1 +Q_temp+13 -15 + 2*/

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

    //move32();

    //L_tmpMax = L_max( L_tmpMax, L_abs( L_output[3] ) );

#else

    L_tmpX = L_shr( Mult_32_16( memory2_fx_2[3], 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( L_tmp2[0], full_band_bpf_fx[2][3] ), 3 ), L_tmpX );                /*Q_input_fx + 6 +Q_temp+13 -15 -3*/

    L_tmpX = L_add_sat( L_shr( Mult_32_16( L_tmp2[1], full_band_bpf_fx[2][2] ), 3 ), L_tmpX );                /*Q_input_fx + 6 +Q_temp+13 -15 -3*/