Commit bbee7e97 authored by sagnowski's avatar sagnowski
Browse files

Replace overflowing basops, pt 3

parent a48e81e3

lib_com/tools_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -2617,7 +2617,11 @@ Word16 dot_prod_satcontr(const Word16 *x, const Word16 *y, Word16 qx, Word16 qy, 
    {

        Overflow = 0;

        move16();

#ifdef BASOP_NOGLOB

        L_tmp = L_shl_o(1, s_max(sub(add(add(qx, qy), 7), shift), 0), &Overflow);

#else /* BASOP_NOGLOB */

        L_tmp = L_shl(1, s_max(sub(add(add(qx, qy), 7), shift), 0));

#endif /* BASOP_NOGLOB */

        pt1 = tmp_tab_x;

        pt2 = tmp_tab_y;

        FOR ( i = 0; i < len; i++ )

lib_enc/hf_cod_amrwb_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -106,7 +106,11 @@ void hf_cod_fx( 
    scale_fx = div_s(shl(1, 14), ener_exc_fx); /*Q(29-q1) */

    L_tmp = L_mult(ener_hf_fx, scale_fx); /*30-q1+q2 */

    q2 = sub(q1, q2); /*30-q2 */

#ifdef BASOP_NOGLOB

    scale_fx = round_fx(Isqrt(L_shl_o(L_tmp, sub(q2, 26), &Overflow))); /*Q13 */

#else /* BASOP_NOGLOB */

    scale_fx = round_fx(Isqrt(L_shl(L_tmp, sub(q2, 26)))); /*Q13 */

#endif /* BASOP_NOGLOB */





    pt1 = HF_fx;