Commit 7d4ed746 authored by vaillancour's avatar vaillancour
Browse files

Fixes VOIP

parent 14067187

lib_com/fft_fx.c

+6 −3
Original line number Diff line number Diff line
@@ -1181,10 +1181,10 @@ static void fft5_shift4_16fx( 
    L_tmp = Msub_32_16(L_tmp,KP587785252_16FX,Ts);

    T3 = round_fx(L_tmp);



    T6 = sub(To,shr(Tp,2));

    T4 = add(Tn,T6);

    T5 = sub(T6,Tn);

#ifdef BASOP_NOGLOB

    T6 = sub_sat(To, shr(Tp, 2));

    T4 = add_sat(Tn, T6);

    T5 = sub_sat(T6, Tn);

    zIm[i4] = sub_sat(T4,T2);

    move16();

    zIm[i2] = sub_sat(T5,T3);
@@ -1194,6 +1194,9 @@ static void fft5_shift4_16fx( 
    zIm[i3] = add_sat(T3,T5);

    move16();

#else

    T6 = sub(To, shr(Tp, 2));

    T4 = add(Tn, T6);

    T5 = sub(T6, Tn);

    zIm[i4] = sub(T4,T2);

    move16();

    zIm[i2] = sub(T5,T3);

lib_dec/hf_synth_fx.c

+8 −1
Original line number Diff line number Diff line
@@ -1040,12 +1040,19 @@ void hf_synth_amr_wb_fx( 
        q3 = add(q3, q1);

        q3 = add(q3, shift);

        q3 = add(q3, q4);

#ifdef BASOP_NOGLOB

        scale = round_fx_sat(Isqrt(L_shl_sat(L_tmp, sub(6, q3)))); /*Q12 */

#else

        scale = round_fx(Isqrt(L_shl(L_tmp, sub(6, q3)))); /*Q12 */



#endif

        pt6 += L_SUBFR;

        FOR ( j = 0; j < L_SUBFR16k; j++ )

        {

#ifdef BASOP_NOGLOB

            *pt2 = round_fx_sat(L_shl_sat(L_mult(*pt2, scale), 2)); /*qhf-1 */

#else

            *pt2 = round_fx(L_shl(L_mult(*pt2, scale), 2)); /*qhf-1 */

#endif

            pt2++;

        }

    }