Commit b22ac477 authored by vaillancour's avatar vaillancour
Browse files

Fixes for 48 stv48c_bw_59_1280_evs_amrwb_48kHz.*.COD

parent c6b10e8d

lib_dec/bass_psfilter_fx.c

+4 −1
Original line number Diff line number Diff line
@@ -191,8 +191,11 @@ void bass_psfilter_fx( 
    }



    tmp = sum16_fx(hBPF->Track_on_hist_fx,L_TRACK_HIST);

#ifdef BASOP_NOGLOB

    TrackOnR = round_fx_sat(L_shl_sat(L_mult0(tmp,3277),16)); /*Q15  */

#else

    TrackOnR = round_fx(L_shl(L_mult0(tmp,3277),16)); /*Q15  */



#endif

    vibratR = sum16_fx(hBPF->vibrato_hist_fx,L_TRACK_HIST); /*Q0 */



    alp_tmp = sub(32767,TrackOnR); /*Q15 */

lib_dec/igf_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -759,8 +759,13 @@ static void IGF_appl(IGF_DEC_PRIVATE_DATA_HANDLE hPrivate 
            /* Build a threshold and compare with L_tmp.

               Build negated threshold and compare with negated L_tmp to cover also fullscale L_tmp case */

            BASOP_SATURATE_WARNING_OFF_EVS

#ifdef BASOP_NOGLOB

            L_tmp2 = L_shl_sat(L_negate(Mpy_32_16_1(sNlocal, 33/*0.001f Q15*/)), sub(sNlocal_e, L_tmp_e));

            L_tmp2 = L_sub_sat(L_tmp2, L_negate(L_tmp));

#else

            L_tmp2 = L_shl(L_negate(Mpy_32_16_1(sNlocal, 33/*0.001f Q15*/)), sub(sNlocal_e, L_tmp_e));

            L_tmp2 = L_sub(L_tmp2, L_negate(L_tmp));

#endif

            BASOP_SATURATE_WARNING_ON_EVS



            IF (L_tmp2 < 0)