Commit aaeaa81f authored by vaillancour's avatar vaillancour
Browse files

fixes AMRIO sw_amrwb_evs.bin 16 T05.INP

parent c59986a8

basic_math/math_op.c

+4 −0
Original line number Diff line number Diff line
@@ -256,7 +256,11 @@ Word32 Energy_scale( /* (o) : Q31: normalized result (1 < 


    IF (expi == 0)

    {

#ifdef BASOP_NOGLOB

        L_sum = L_mac_o(1, x[0], x[0], &Overflow);

#else

        L_sum = L_mac(1, x[0], x[0]);

#endif

        FOR (i = 1; i < lg; i++)

        {

#ifdef BASOP_NOGLOB

lib_com/deemph_fx.c

+7 −1
Original line number Diff line number Diff line
@@ -79,7 +79,9 @@ void Deemph2( 
{

    Word16 i;

    Word32 L_tmp;



#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

#endif

    /* saturation can occur in L_mac() */



    L_tmp = L_mult(x[0], 16384);
@@ -89,7 +91,11 @@ void Deemph2( 
    FOR (i = 1; i < L; i++)

    {

        L_tmp = L_mult(x[i], 16384);

#ifdef BASOP_NOGLOB

        x[i] = mac_ro(L_tmp, x[i - 1], mu, &Overflow);

#else

        x[i] = mac_r(L_tmp, x[i - 1], mu);

#endif

        move16();

    }

lib_enc/acelp_enc_util.c

+7 −1
Original line number Diff line number Diff line
@@ -157,7 +157,9 @@ void E_ACELP_conv( 
{

    Word16 i, k;

    Word32 L_tmp;



#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

#endif

    FOR (k=0; k<L_SUBFR; k++)

    {

        /*cn2[k] = xn2[k];     */
@@ -169,7 +171,11 @@ void E_ACELP_conv( 
            L_tmp_64 = W_msu0_16_16(L_tmp_64,cn2[i],h2[k-i]);  /*h2 4Q11*/

        }

        L_tmp = W_sat_l( L_tmp_64 );

#ifdef BASOP_NOGLOB

        cn2[k] = round_fx_o(L_shl_o(L_tmp,5, &Overflow), &Overflow);

#else

        cn2[k] = round_fx(L_shl(L_tmp,5));

#endif

    }

}