Commit f7dbc320 authored by vaillancour's avatar vaillancour
Browse files

more fixes for hi-level content

parent 85a2f73f

lib_com/pvq_com_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ void fine_gain_quant_fx( 
            L_tmp = L_Comp(tmp1, exp2);

            Mpy_32_16_ss(L_tmp, 24660, &L_tmp, &lsb);   /* 24660 = 20*log10(2) in Q12 */ /*16+12-15=13 */

#ifdef BASOP_NOGLOB

            gain_db = round_fx(L_shl_o(L_tmp, 17, &Overflow));

            gain_db = round_fx_sat(L_shl_o(L_tmp, 17, &Overflow));

#else /* BASOP_NOGLOB */

            gain_db = round_fx(L_shl(L_tmp, 17));

#endif

lib_enc/enc_acelpx_fx.c

+5 −1
Original line number Diff line number Diff line
@@ -153,7 +153,11 @@ static void E_ACELP_2pulse_searchx( 
    move16();

    /*alp0 = *alp + 2.0f*R[0];                         move16();*/

    alp0 = L_deposit_h(*alp);               /* Qalp = Q_R*Q_signval */

#ifdef BASOP_NOGLOB

    alp0 = L_mac_sat( alp0, R[0], sign_val_2 );

#else

    alp0 = L_mac( alp0, R[0], sign_val_2 );

#endif



    /* Ensure that in the loop below s > 0 in the first iteration, the actual values do not matter. */

    sqk[0] = -1;

lib_enc/igf_enc_fx.c

+5 −1
Original line number Diff line number Diff line
@@ -741,7 +741,11 @@ static Word16 IGF_getSFM( 


        /*Transform to Q15*/

        s         = norm_l(SFM32);

#ifdef BASOP_NOGLOB

        SFM = round_fx_sat( L_shl_sat( SFM32, s ) );

#else

        SFM = round_fx( L_shl( SFM32, s ) );

#endif

        *SFM_exp  = sub(*SFM_exp, s);



        /**SFM_exp = s_min(*SFM_exp, 0);*/

lib_enc/set_impulse_fx.c

+11 −2
Original line number Diff line number Diff line
@@ -376,8 +376,17 @@ static void correlate_tc_fx( 
        s = L_deposit_l(0);

        FOR (j = i; j < L_1; j++)

        {

#ifdef BASOP_NOGLOB

            s = L_mac_sat( s, x[j], h[j - i] );

#else

            s = L_mac( s, x[j], h[j - i] );

#endif

        }

#ifdef BASOP_NOGLOB

        y[i] = round_fx_sat( s );

#else

        y[i] = round_fx( s );

#endif

    }



}

lib_enc/swb_bwe_enc_fx.c

+10 −2
Original line number Diff line number Diff line
@@ -1047,7 +1047,11 @@ static void vqWithCand_w_fx( 


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

        {

#ifdef BASOP_NOGLOB

            dist = sub_sat( x[0], *p_E_ROM_dico++ ); /*Q8 */

#else

            dist = sub( x[0], *p_E_ROM_dico++ ); /*Q8 */

#endif

            L_dist = L_mult(dist,dist);/*Q17 */

            L_dist = L_shr(L_dist,12);/*Q5 */
@@ -2702,7 +2706,11 @@ static Word16 decision_hq_generic_class_fx_32 ( 
            exp = norm_l(coefs_fx[i]);

            tmp = extract_h(L_shl(coefs_fx[i], exp));/*12 + exp - 16 */

            L_tmp = L_mult0(tmp, tmp);/*2 * exp - 8 */

#ifdef BASOP_NOGLOB

            L_tmp = L_shl_sat( L_tmp, sub( 14, shl( exp, 1 ) ) ); /*6 */

#else

            L_tmp = L_shl( L_tmp, sub( 14, shl( exp, 1 ) ) ); /*6 */

#endif

            IF (GT_32(L_tmp , p_fx))

            {

                p_fx = L_add(L_tmp, 0);/*6 */