Commit 78ce2cd2 authored by vaillancour's avatar vaillancour
Browse files

Fixes more IO

parent c8764650

lib_com/swb_bwe_com_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -180,7 +180,11 @@ Word16 WB_BWE_gain_pred_fx( 
    test();

    IF(NE_16(coder_type,AUDIO)&&NE_16(coder_type,UNVOICED)&&ener_var_flag==0)

    {

#ifdef BASOP_NOGLOB

        WB_fenv[0]= add_sat(WB_fenv[0], mult_r_sat(WB_fenv[0], 16384));

#else

        WB_fenv[0]= add(WB_fenv[0], mult_r(WB_fenv[0], 16384));

#endif

        move16();

    }

lib_dec/waveadjust_fec_dec.c

+18 −0
Original line number Diff line number Diff line
@@ -1167,18 +1167,32 @@ static void add_noise (Word16 * const sbuf, 


    IF( !firstFrame )

    {

#ifdef BASOP_NOGLOB

        temp_OUT = sub_sat(noise_seg[0], mult((*outx_new_n1),22282/* 0.68 Q15 */));

        sbuf[0] = add_sat(sbuf[0], mult((temp_OUT), *gain));

        move16();

        *gain = mac_r_sat(L_mult_sat(32439/* 0.99 Q15 */,*gain),328/* 0.01 Q15 */,*gain_n);

#else

        temp_OUT = sub(noise_seg[0], mult((*outx_new_n1),22282/* 0.68 Q15 */));

        sbuf[0] = add(sbuf[0], mult((temp_OUT), *gain));

        move16();

        *gain = mac_r(L_mult(32439/* 0.99 Q15 */,*gain),328/* 0.01 Q15 */,*gain_n);

#endif

    }



    FOR( i = 1; i < Len; i++ )

    {

#ifdef BASOP_NOGLOB

        temp_OUT = sub_sat(noise_seg[i], mult((noise_seg[i-1]),22282/* 0.68 Q15 */));

        sbuf[i] = add_sat(sbuf[i], mult((temp_OUT), *gain));

        move16();

        *gain = mac_r_sat(L_mult(32439/* 0.99 Q15 */,*gain),328/* 0.01 Q15 */,*gain_n);

#else

        temp_OUT = sub(noise_seg[i], mult((noise_seg[i-1]),22282/* 0.68 Q15 */));

        sbuf[i] = add(sbuf[i], mult((temp_OUT), *gain));

        move16();

        *gain = mac_r(L_mult(32439/* 0.99 Q15 */,*gain),328/* 0.01 Q15 */,*gain_n);

#endif

    }



    *outx_new_n1 = noise_seg[i-1]; /*q0*/
@@ -1294,7 +1308,11 @@ Word16 waveform_adj_fix(Word16 *overlapbuf, 
            }

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

            {

#ifdef BASOP_NOGLOB

                pitch125_data[i] = round_fx_sat(L_shr_sat(L_add_sat((L_mult(p_tmp[i], 20972)),L_mac_sat(L_mult(p_tmp[i-1], 5898),p_tmp[i+1],5898)),s16MaxCoefNorm));

#else

                pitch125_data[i] = round_fx(L_shr(L_add((L_mult(p_tmp[i], 20972)),L_mac(L_mult(p_tmp[i-1], 5898),p_tmp[i+1],5898)),s16MaxCoefNorm));

#endif

            }

        }