Commit 11407852 authored by vaillancour's avatar vaillancour
Browse files

Fixes for 32 stv32n1_dtx_bw_59_1280_evs_amrwb_32kHz.*.COD

parent d7597abc

lib_dec/hf_synth_fx.c

+10 −10
Original line number Diff line number Diff line
@@ -535,10 +535,6 @@ void hf_synth_amr_wb_fx( 
    Word32 exc32[L_FRAME], dct_exc32[L_FRAME], dct_hb32[L_FRAME16k], exc16k32[L_FRAME16k];

    Word16 q_tmp;

    Word16 gamma;

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

#endif





    Scale_sig(synth, L_FRAME, -3);
@@ -620,7 +616,7 @@ void hf_synth_amr_wb_fx( 
    }



#ifdef BASOP_NOGLOB

    L_tmp = L_mult(fmerit_w, add_o(16384, voice_fac, &Overflow));

    L_tmp = L_mult(fmerit_w, add_sat(16384, voice_fac));

#else

    L_tmp = L_mult(fmerit_w, add(16384, voice_fac));

#endif
@@ -761,7 +757,7 @@ void hf_synth_amr_wb_fx( 
            FOR (j=0; j<fn; j++)

            {

#ifdef BASOP_NOGLOB

                tmp = add_o(tmp, shr(*pt4++, 2), &Overflow); /*qdct-2 */

                tmp = add_sat(tmp, shr(*pt4++, 2)); /*qdct-2 */

#else

                tmp = add(tmp, shr(*pt4++,2)); /*qdct-2 */

#endif
@@ -786,7 +782,7 @@ void hf_synth_amr_wb_fx( 
            FOR (j=fb; j<fn; j++)

            {

#ifdef BASOP_NOGLOB

                tmp = add_o(tmp, shr(*pt4++, 2), &Overflow); /*qdct-2 */

                tmp = add_sat(tmp, shr(*pt4++, 2)); /*qdct-2 */

#else

                tmp = add(tmp, shr(*pt4++,2)); /*qdct-2 */

#endif
@@ -814,7 +810,7 @@ void hf_synth_amr_wb_fx( 
            FOR (j=fb; j<L_SUBFR16k; j++)

            {

#ifdef BASOP_NOGLOB

                tmp = add_o(tmp, shr(*pt4++, 2), &Overflow); /*qdct-2 */

                tmp = add_sat(tmp, shr(*pt4++, 2)); /*qdct-2 */

#else

                tmp = add(tmp, shr(*pt4++,2)); /*qdct-2 */

#endif
@@ -866,7 +862,11 @@ void hf_synth_amr_wb_fx( 
        L_tmp = L_mult(ener, scale); /*30-q1+q2 */

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

        scale = round_fx(Isqrt(L_shl(L_tmp, sub(q2, 24))));  /*Q12  */

#ifdef BASOP_NOGLOB

        scale = round_fx_sat(L_shl_sat(L_mult(scale, gamma),4)); /*Q15 */

#else

        scale = round_fx(L_shl(L_mult(scale, gamma),4)); /*Q15 */

#endif

    }

    ELSE

    {
@@ -1000,7 +1000,7 @@ void hf_synth_amr_wb_fx( 
        L_tmp = L_shl(L_tmp, shift); /*Q(q3+shift); */

        q3 = add(q3, shift);

#ifdef BASOP_NOGLOB

        scale = round_fx_o(L_tmp, &Overflow); /*Q(q3-16); */

        scale = round_fx_sat(L_tmp); /*Q(q3-16); */

#else

        scale = round_fx(L_tmp); /*Q(q3-16); */

#endif
@@ -1010,7 +1010,7 @@ void hf_synth_amr_wb_fx( 
        shift = norm_l(L_tmp);

        L_tmp = L_shl(L_tmp, shift); /*Q(29-q3+q1+1+shift) */

#ifdef BASOP_NOGLOB

        scale = round_fx_o(L_tmp, &Overflow); /*Q(29-q3+q1+1+shift-16) */

        scale = round_fx_sat(L_tmp); /*Q(29-q3+q1+1+shift-16) */

#else

        scale = round_fx(L_tmp); /*Q(29-q3+q1+1+shift-16) */

#endif