Commit bda21755 authored by vaillancour's avatar vaillancour
Browse files

Fix for FB switching

parent 7e0cd6b9

lib_com/modif_fs_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -687,10 +687,11 @@ void Decimate_allpass_steep_fx( 
        Lacc = L_deposit_h( mem[ ALLPASSSECTIONS_STEEP-1 ] );                                              /* Q(16+x)              */

#ifdef BASOP_NOGLOB

        out_fx[ k ] = extract_h( L_mac_o( Lacc, AP1_STEEP_FX[ ALLPASSSECTIONS_STEEP-1 ], temp2, &Overflow ));                /* Qx format            */

        mem[ALLPASSSECTIONS_STEEP - 1] = extract_h(L_msu_o(Lacc1, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[k], &Overflow)); /* Qx    */

#else

        out_fx[ k ] = extract_h( L_mac( Lacc, AP1_STEEP_FX[ ALLPASSSECTIONS_STEEP-1 ], temp2 ));                /* Qx format            */

#endif

        mem[ALLPASSSECTIONS_STEEP - 1] = extract_h(L_msu(Lacc1, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[k])); /* Qx    */

#endif



    }

lib_com/swb_bwe_com_lr_fx.c

+8 −1
Original line number Diff line number Diff line
@@ -2284,8 +2284,11 @@ void ton_ene_est_fx( 


        /* 0.06=15729(Q18) */

        exp_shift = sub(18, QE_r);

#ifdef BASOP_NOGLOB

        E_r_shift_fx = shl_o(E_r_fx, exp_shift, &Overflow);

#else

        E_r_shift_fx = shl(E_r_fx, exp_shift);



#endif

        IF ( LT_16(E_r_shift_fx, 15729)) /* E_r < 0.06  */

        {

            /* avg_pe[k] = (float) sqrt(pow(2.0f,band_energy[i])/band_width[i]); */
@@ -2322,7 +2325,11 @@ void ton_ene_est_fx( 
            L_temp = Mult_32_16(L_temp, E_r_fx);



            /* 0.12f: 257698038 (Q31) */

#ifdef BASOP_NOGLOB

            if( GE_32(L_shl_o(L_temp,sub(31, add(add(shl(Qavg_pe[k], 1), QE_r), 1-15)), &Overflow), 257698038))

#else

            if( GE_32(L_shl(L_temp,sub(31, add(add(shl(Qavg_pe[k], 1), QE_r), 1-15))), 257698038))

#endif

            {

                ni_gain_fx[k] = mult_r(1638, ni_gain_fx[k]); /* 0.05 : 1638(Q15) */ move16();

            }