Commit 94c831ce authored by vaillancour's avatar vaillancour
Browse files

Fix for 9600 and switching for 32 stv32n1

parent 3935178b

lib_enc/cod2t32_fx.c

+11 −1
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@ void acelp_2t32_fx( 
    Word32 L_tmp;

    Word16 rrixix[NB_TRACK_FCB_2T][NB_POS_FCB_2T];

    Word16 rrixiy[MSIZE];



#ifdef BASOP_NOGLOB

    Flag Overflow = 0;

#endif

    /*----------------------------------------------------------------*

     * Compute rrixix[][] needed for the codebook search.

     *----------------------------------------------------------------*/
@@ -232,9 +234,17 @@ void acelp_2t32_fx( 
        FOR (i1 = 1; i1 < L_SUBFR; i1 += STEP)

        {

            ps2 = add(ps1,dn_p[i1]);

#ifdef BASOP_NOGLOB

            alp2 = add_o(alp1, add_o(*p1++, *p2++, &Overflow), &Overflow);

#else

            alp2 = add(alp1, add(*p1++, *p2++));

#endif

            sq = mult(ps2, ps2);

#ifdef BASOP_NOGLOB

            s = L_msu_o(L_mult(alpk, sq), psk, alp2, &Overflow);

#else

            s = L_msu(L_mult(alpk, sq), psk, alp2);

#endif

            IF(s > 0)

            {

                psk = sq;

lib_enc/enc_acelp.c

+11 −1
Original line number Diff line number Diff line
@@ -722,7 +722,9 @@ void E_ACELP_codebook_target_update(Word16 *x, Word16 *x2, Word16 *y, 
{

    Word16 i, Q15_flag;

    Word32 L_tmp;



#ifdef BASOP_NOGLOB

    Flag Overflow = 0;

#endif

    assert(gain >= 0);



    Q15_flag = 0;
@@ -739,9 +741,17 @@ void E_ACELP_codebook_target_update(Word16 *x, Word16 *x2, Word16 *y, 
        L_tmp = L_deposit_h(x[i]);

        if (Q15_flag == 0)

        {

#ifdef BASOP_NOGLOB

            L_tmp = L_msu_o(L_tmp, y[i], gain, &Overflow);

#else

            L_tmp = L_msu(L_tmp, y[i], gain);

#endif

        }

#ifdef BASOP_NOGLOB

        x2[i] = msu_ro(L_tmp, y[i], gain, &Overflow);

#else

        x2[i] = msu_r(L_tmp, y[i], gain);

#endif

        move16();

    }

}