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

Revert "fic... 

Revert "fic FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig/FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic, deactivate both"

This reverts commit de9181e6.
parent 9a9bad21

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ 
#define FIX_1439_SPEEDUP_Copy_Scale_sig_16_32_no_sat            /*FhG: reduces WMOPS - bit-exact*/ //   |

#define FIX_1439_SPEEDUP_stereo_icBWE_dec_fx                    /*FhG: reduces WMOPS - bit-exact*/ //   | 2.4 WMOPS

#define FIX_1439_SPEEDUP_ivas_swb_tbe_dec_fx                    /*FhG: reduces WMOPS - bit-exact*/ //   |

//#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig  /*FhG: reduces WMOPS - bit-exact*/ //   |

//#define FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic              /*FhG: reduces maintenance complexity */

#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig  /*FhG: reduces WMOPS - bit-exact*/ //   |

#define FIX_1439_SIMPLIFY_elliptic_bpf_48k_generic              /*FhG: reduces maintenance complexity */



#define FIX_1439_SPEEDUP_synthesise_fb_high_band_fx                                              // |   0.4 WMOPS - BE?

lib_com/swb_tbe_com_fx.c

+33 −45
Original line number Diff line number Diff line
@@ -6862,12 +6862,15 @@ 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

    IF( isUpsampledBy3 )

    {

#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 ), 0 );           /*Q_input_fx + 13 + 1 - 3*/
@@ -6880,21 +6883,6 @@ 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();

        }

#else

            FOR( i = 4; 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*/

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

                // L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i - 2], full_band_bpf_fx[0][2] ), 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 - 2], full_band_bpf_fx[3][2] ), 2 ) ); /*Q_input_fx + 11 + 13  -15 +2*/

                L_tmpX = L_add_sat( L_shr( L_mult( input_fx[i - 1], full_band_bpf_fx[0][1] ), 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 - 3], full_band_bpf_fx[3][3] ), 2 ) );   /*Q_input_fx + 11 + 13  -15 +2*/

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

    }

    ELSE

#endif /*FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_upsampledsig*/
@@ -6917,7 +6905,7 @@ void elliptic_bpf_48k_generic_fx( 
            move32();

        }

    }

    }





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

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