Commit a426e801 authored by vaillancour's avatar vaillancour
Browse files

Fixes for stv16c_dtx_8000_16kHz.COD

parent 49c86008

lib_com/frame_ener_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -213,10 +213,11 @@ Word16 frame_energy_fx( /* o : Frame energy in 


    /*make 10*log10 out of log2*/

    Ltmp = Mpy_32_16_1(Ltmp,LG10); /*Q25,tmp16 * Q13 = Q23, tmp16*/

    *frame_ener = extract_h(L_shl(Ltmp,add(tmp16,1)));/*Q8*/                    move16();

#ifdef BASOP_NOGLOB

    * frame_ener = extract_h(L_shl_o(Ltmp, add(tmp16, 1), &Overflow));/*Q8*/                    move16();

    enern = sub_o(*frame_ener, lp_speech, &Overflow); /*Q8*/

#else

    * frame_ener = extract_h(L_shl(Ltmp, add(tmp16, 1)));/*Q8*/                    move16();

    enern = sub( *frame_ener  ,lp_speech); /*Q8*/

#endif

lib_com/swb_bwe_com_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -191,7 +191,11 @@ Word16 WB_BWE_gain_pred_fx( 
    tmp = div_s(16384, tmp);

    L_tmp = L_deposit_h(tmp);

    L_tmp = Isqrt_lc(L_tmp, &exp);

#ifdef BASOP_NOGLOB

    enerL_16 = round_fx_o(L_shl_o(L_tmp, sub(exp, 15), &Overflow), &Overflow); /* Q0 */

#else

    enerL_16 = round_fx(L_shl(L_tmp, sub(exp, 15))); /* Q0 */

#endif

    enerL_40 = mult_r(6554, enerL_16); /*1/40 in Q18  ->Q3    */



    test();

lib_dec/hf_synth_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -248,7 +248,11 @@ static void hf_synthesis_fx( 
    {

        /* emphasize HF noise in CNG */

        /*fac *= 2.0f;*/

#ifdef BASOP_NOGLOB

        tmp = add_o(tmp, tmp, &Overflow);

#else

        tmp = add(tmp, tmp);

#endif

    }

    tmp = s_max(tmp, 3277); /* 0.1 in Q15 */