Commit 7e0cd6b9 authored by vaillancour's avatar vaillancour
Browse files

Fix for FB switching

parent 9a5f9f64

lib_com/fd_cng_com.c

+4 −0
Original line number Diff line number Diff line
@@ -525,7 +525,11 @@ void minimum_statistics ( 
                    /* use absolute value to avoid -1.0 x -1.0 multiplications */

                    s2 = norm_l(scalar2);

                }

#ifdef BASOP_NOGLOB

                scalar216 = round_fx_o(L_shl_o(scalar2,s2, &Overflow), &Overflow);

#else

                scalar216 = round_fx(L_shl(scalar2,s2));

#endif

                scalar2 = L_mult(scalar216, scalar216);



                /* find common exponent */

lib_com/wi_fx.c

+7 −1
Original line number Diff line number Diff line
@@ -2767,7 +2767,9 @@ void DTFS_erb_inv_fx( 
    Word32 Ltemp_fx,Ltemp2_fx;

    Word32 Lacc_fx;

    Word16 exp,tmp;



#ifdef BASOP_NOGLOB

    Flag Overflow = 0;

#endif



    IF (EQ_16(num_erb_fx,NUM_ERB_NB))

    {
@@ -2852,7 +2854,11 @@ void DTFS_erb_inv_fx( 
                    d2h = 31;

                    move16();

                }

#ifdef BASOP_NOGLOB

                X_fx->a_fx[i]=round_fx_o(L_shl_o(Ltemp_fx,d2h, &Overflow), &Overflow); /*  Q(28-n+d2h) */

#else

                X_fx->a_fx[i]=round_fx(L_shl(Ltemp_fx,d2h)); /*  Q(28-n+d2h) */

#endif

                q[i]=add(sub(28,n),d2h);

                min_q=s_min(min_q,q[i]);