Commit d8ab503c authored by vaillancour's avatar vaillancour
Browse files

fixes SWB content...

parent bc566311

lib_com/fd_cng_com.c

+4 −0
Original line number Diff line number Diff line
@@ -674,7 +674,11 @@ void minimum_statistics ( 
                s2 = s_min(s2,WORD32_BITS-1);



                /* beta: scaled by s2 */

#ifdef BASOP_NOGLOB

                tmp16 = round_fx_o(L_shl_o(tmp, s1, &Overflow), &Overflow);

#else

                tmp16 = round_fx(L_shl(tmp, s1));

#endif

                beta = mult_r(tmp16, tmp16);



                /* scalar3: scaled by s3 */

lib_com/low_rate_band_att_fx.c

+4 −1
Original line number Diff line number Diff line
@@ -73,8 +73,11 @@ void fine_gain_pred_fx( 
                exp = sub(31, add(exp, sub(30, shl(shift,1))));

                L_tmp = Isqrt_lc(L_tmp, &exp);  /*31 - exp */

                Mpy_32_16_ss(L_tmp, fine_gain_pred_sqrt_bw[bw_idx], &L_tmp, &lsb);  /*31-exp+11-15=27-exp */

#ifdef BASOP_NOGLOB

                gp = round_fx_o(L_shl_o(L_tmp, add(1, exp), &Overflow), &Overflow);   /*27-exp+1+exp-16=12 */

#else

                gp = round_fx(L_shl(L_tmp, add(1, exp)));   /*27-exp+1+exp-16=12 */



#endif

                test();

                test();

                IF (EQ_16(core, HQ_CORE)&&R!=NULL&&LE_16(R[i_sort[band]],256))     /* 256 is 32 in Q3 */

lib_com/swb_tbe_com_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -1672,7 +1672,11 @@ void GenShapedSHBExcitation_fx( 
        tmp = add(*Q_bwe_exc, 1);

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

        {

#ifdef BASOP_NOGLOB

            L_tmp4 = L_shl_o(L_deposit_l(White_exc16k[k]), tmp, &Overflow);

#else

            L_tmp4 = L_shl(L_deposit_l(White_exc16k[k]), tmp);

#endif

            if (excNoisyEnv[k] != 0)

            {

                L_tmp4 = L_mult(excNoisyEnv[k], White_exc16k[k]);/* (Q_bwe_exc)  +5 +1*/
@@ -1703,7 +1707,11 @@ void GenShapedSHBExcitation_fx( 
            /* i: White_exc16k  in Q6               */

            /* o: White_exc16k in (Q_bwe_exc-NOISE_QADJ)  */

            /* pow22 += White_exc16k[k] * White_exc16k[k]; */

#ifdef BASOP_NOGLOB

            pow22 = L_mac0_o(pow22, White_exc16k[k], White_exc16k[k], &Overflow);  /* 2*(Q_bwe_exc-NOISE_QADJ)*/

#else

            pow22 = L_mac0(pow22, White_exc16k[k], White_exc16k[k]);  /* 2*(Q_bwe_exc-NOISE_QADJ)*/

#endif

        }

        /*Q_pow22 = sub( shl(*Q_bwe_exc,1), 18 );*/

        Q_pow22 = shl(sub(*Q_bwe_exc, NOISE_QADJ), 1);

lib_enc/gaus_enc_fx.c

+5 −1
Original line number Diff line number Diff line
@@ -427,9 +427,13 @@ void gauss2v_fx( 


            cor2_norm = norm_l(cor2);

            eneri_norm = norm_l(eneri);

#ifdef BASOP_NOGLOB

            cor2_mantissa = round_fx_o(L_shl_o(cor2, cor2_norm, &Overflow), &Overflow);

            eneri_mantissa = round_fx_o(L_shl_o(eneri, eneri_norm, &Overflow), &Overflow);

#else

            cor2_mantissa = round_fx(L_shl(cor2, cor2_norm));

            eneri_mantissa = round_fx(L_shl(eneri, eneri_norm));



#endif

            difference_norm = sub(add(cor2_norm, enerw_norm), add(cor2w_norm, eneri_norm));



            update_best = 0;

lib_enc/hvq_enc_fx.c

+7 −1
Original line number Diff line number Diff line
@@ -47,7 +47,9 @@ Word16 hvq_enc_fx( /*o : Consumed bits 
    Word16 expPeMean, expNfMean, expNfpe, expNfpe3, expo, expo3;

    Word16 manPeMean, manNfMean, manNfpe, man;

    Word16 tmp16, adjust;



#ifdef BASOP_NOGLOB

    Flag Overflow = 0;

#endif 

    bits_used = 0;

    move16();
@@ -175,7 +177,11 @@ Word16 hvq_enc_fx( /*o : Consumed bits 
                lb_nfpe = 16384;

                move16();

            }

#ifdef BASOP_NOGLOB

            Mpy_32_16_ss(nf_gains[i], shl_o(lb_nfpe, 1, &Overflow), &nf_gains[i], &dontCare); /* nf_gains[] in Q12 */

#else

            Mpy_32_16_ss(nf_gains[i], shl(lb_nfpe, 1), &nf_gains[i], &dontCare); /* nf_gains[] in Q12 */

#endif

        }

        ELSE

        {