Commit d1f30399 authored by vaillancour's avatar vaillancour
Browse files

more fixes under dtx conditions

parent 5f616350

lib_com/gs_noisefill_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -1038,10 +1038,11 @@ void highband_exc_dct_in_fx( 
                        IF(GT_16(tmp,abs_s(*dst)))

                        {

                            tmp2 = *src;

                            *src = mult_r(16384,sub(*src , abs_s(*dst))); /*Q_exc */      move16();

#ifdef BASOP_NOGLOB

                            * src = mult_r(16384, sub_o(*src, abs_s(*dst), &Overflow)); /*Q_exc */      move16();

                            tmp = mult_r(16384,add_o(tmp2 , abs_s(*dst), &Overflow));  /*Q_exc */

#else /* BASOP_NOGLOB */

                            * src = mult_r(16384, sub(*src, abs_s(*dst))); /*Q_exc */      move16();

                            tmp = mult_r(16384,add(tmp2 , abs_s(*dst)));  /*Q_exc */

#endif /* BASOP_NOGLOB */

                            if( tmp2 > 0 )

lib_com/swb_tbe_com_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -3864,7 +3864,11 @@ void prep_tbe_exc_fx( 
    IF ( EQ_16(L_frame_fx,L_FRAME))

    {

        interp_code_5over2_fx( code_fx, tmp_code_fx, L_subfr);   /* code: Q9, tmp_code: Q9 */

#ifdef BASOP_NOGLOB

        gain_code16 = round_fx_o( L_shl_o( gain_code_fx, Q_exc, &Overflow ), &Overflow); /*Q_exc */

#else

        gain_code16 = round_fx( L_shl( gain_code_fx, Q_exc ) ); /*Q_exc */

#endif

        FOR ( i = 0; i < L_subfr* HIBND_ACB_L_FAC; i++ )

        {

            L_tmp = L_mult( gain_code16, tmp_code_fx[i] );   /* Q9 + Q_exc + 1*/

lib_com/tools_fx.c

+7 −1
Original line number Diff line number Diff line
@@ -299,7 +299,9 @@ void Copy_Scale_sig( 
{

    Word16 i;

    Word16 tmp;



#ifdef BASOP_NOGLOB

    Flag Overflow = 0;

#endif

    IF (exp0 == 0)

    {

        FOR (i = 0; i < lg; i++)
@@ -321,7 +323,11 @@ void Copy_Scale_sig( 
    }

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

    {

#ifdef BASOP_NOGLOB

        y[i] = shl_o(x[i], exp0, &Overflow);

#else

        y[i] = shl(x[i], exp0);

#endif

        move16();/* saturation can occur here */

    }

}

lib_enc/enc_gen_voic_fx.c

+7 −0
Original line number Diff line number Diff line
@@ -366,10 +366,17 @@ void encod_gen_voic_fx( 
            {

                /* code in Q9, gain_pit in Q14 */

                Ltmp = L_mult(gcode16, code_fx[i]);

#ifdef BASOP_NOGLOB

                Ltmp = L_shl_o(Ltmp, 5, &Overflow);

                Ltmp = L_mac_o(Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx, &Overflow);

                Ltmp = L_shl_o(Ltmp, 1, &Overflow); /* saturation can occur here */

                exc_fx[i + i_subfr_fx] = round_fx_o(Ltmp, &Overflow);

#else

                Ltmp = L_shl(Ltmp, 5);

                Ltmp = L_mac(Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx);

                Ltmp = L_shl(Ltmp, 1); /* saturation can occur here */

                exc_fx[i + i_subfr_fx] = round_fx(Ltmp);

#endif

            }

        }

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