Commit 1862f347 authored by vaillancour's avatar vaillancour
Browse files

Fixes for 48 stv48c_dtx_sw_59_244_48kHz.*.COD

parent 4218e340

lib_com/swb_bwe_com_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -1471,8 +1471,13 @@ void SWB_BWE_decoding_fx( 
                Copy(&core_dec_freq[112], &SWB_signal[368+st_offset], 128);

                Copy(&core_dec_freq[176], &SWB_signal[496+st_offset], 64);



#ifdef BASOP_NOGLOB

                tmp1 = add_sat(abs_s(SWB_signal[368+st_offset]), abs_s(SWB_signal[369+st_offset])); /*Q_syn */

                tmp2 = add_sat(abs_s(SWB_signal[365+st_offset]), abs_s(SWB_signal[366+st_offset])); /*Q_syn */

#else

                tmp1 = add(abs_s(SWB_signal[368+st_offset]), abs_s(SWB_signal[369+st_offset])); /*Q_syn */

                tmp2 = add(abs_s(SWB_signal[365+st_offset]), abs_s(SWB_signal[366+st_offset])); /*Q_syn */

#endif

                pit1 = &SWB_signal[368+st_offset];

                move16();

lib_com/trans_inv_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -275,10 +275,11 @@ void preecho_sb_fx( 
                tmp_fx1 = shr(*fxptr2, q16p1); /*q-1 to avoisd saturation in energy*/

#ifdef BASOP_NOGLOB

                tmp_fxL1 = L_mac0_sat(tmp_fxL1, tmp_fx1, tmp_fx1);

                tmp_fxL2 = L_mac0_sat(tmp_fxL2, *fxptr3, *fxptr3);

#else

                tmp_fxL1 = L_mac0(tmp_fxL1, tmp_fx1, tmp_fx1);

#endif

                tmp_fxL2 = L_mac0(tmp_fxL2, *fxptr3, *fxptr3);

#endif

                cntnzcr = add(cntnzcr, 1);

                IF( L_mult0(*fxptr2, *(fxptr2-1)) <= 0 )

                {

lib_dec/core_switching_dec_fx.c

+6 −4
Original line number Diff line number Diff line
@@ -1121,9 +1121,7 @@ ivas_error core_switching_post_dec_fx( 
    FD_BWE_DEC_HANDLE hBWE_FD;

    HQ_DEC_HANDLE hHQ_core;

    ivas_error error;

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

#endif



#ifdef IVAS_CODE_SWITCHING

    int16_t offset;

#endif
@@ -1241,7 +1239,11 @@ ivas_error core_switching_post_dec_fx( 
            FOR( i=0; i<shift; i++ )

            {

                L_tmp = L_mult((*ptmp1), tmpF); /*Qsynth + 16*/

#ifdef BASOP_NOGLOB

                *ptmp1 = round_fx_sat( L_mac_sat( L_tmp, add_sat(sub(24576, tmpF),8192), (*ptmp2))); /*Qsynth*/

#else

                *ptmp1 = round_fx( L_mac( L_tmp, add(sub(24576, tmpF),8192), (*ptmp2))); /*Qsynth*/

#endif

                ptmp1++;

                ptmp2++;

                tmpF = add(tmpF, tmp);
@@ -1262,7 +1264,7 @@ ivas_error core_switching_post_dec_fx( 
            {

                L_tmp = L_mult((*ptmp1), tmpF); /*Qsynth + 16*/

#ifdef BASOP_NOGLOB

                *ptmp1 = round_fx(L_mac(L_tmp, add_o(sub(24576, tmpF), 8192, &Overflow), (*ptmp2))); /*Qsynth*/

                *ptmp1 = round_fx_sat(L_mac_sat(L_tmp, add_sat(sub(24576, tmpF), 8192), (*ptmp2))); /*Qsynth*/

#else

                *ptmp1 = round_fx( L_mac( L_tmp, add(sub(24576, tmpF),8192), (*ptmp2))); /*Qsynth*/

#endif

lib_dec/er_dec_tcx.c

+5 −5
Original line number Diff line number Diff line
@@ -44,11 +44,11 @@ static void calcGainc(Word16* exc, Word16 Q_exc, Word32 old_fpitch, Word16 L_sub 
    {

        /*st->lp_gainc += ( exc[i-2*L_subfr] - st->Mode2_lp_gainp * exc[i-2*L_subfr-(int)(st->old_fpitch+0.5f)] ) *

                          ( exc[i-2*L_subfr] - st->Mode2_lp_gainp * exc[i-2*L_subfr-(int)(st->old_fpitch+0.5f)] );*/

        tmp16_3 = sub

                  (

                      exc[i-2*L_subfr]      /*Q1*/,

                      mult_r(tmp16_2       /*Q15*/, exc[i-2*L_subfr-tmp16]/*Q1*/)/*Q1*/

                  );

#ifdef BASOP_NOGLOB

        tmp16_3 = sub_o(exc[i-2*L_subfr] /*Q1*/,mult_r(tmp16_2 /*Q15*/, exc[i-2*L_subfr-tmp16]/*Q1*/)/*Q1*/, &Overflow);

#else

        tmp16_3 = sub(exc[i-2*L_subfr] /*Q1*/,mult_r(tmp16_2 /*Q15*/, exc[i-2*L_subfr-tmp16]/*Q1*/)/*Q1*/);

#endif

#ifdef BASOP_NOGLOB

        L_acc = L_macNs_co(L_acc, tmp16_3, tmp16_3, &Carry, &Overflow); /*Q3*/

#else

lib_dec/evs_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -723,7 +723,11 @@ PMT("bw_switching_pre_proc_fx missing args") 
                fra = Log2_norm_lc(L_shl(L_tmp, exp));

                exp = sub(sub(30, shl(hb_synth_fx_exp,1)), exp);

                L_tmp = Mpy_32_16(exp, fra, LG10);

#ifdef BASOP_NOGLOB

                st_fx->last_shb_ener_fx = round_fx_sat(L_shl_sat(L_tmp, 10)); /*Q8*/

#else

                st_fx->last_shb_ener_fx = round_fx(L_shl(L_tmp, 10)); /*Q8*/

#endif

            }

        }

        hBWE_TD->prev_hb_synth_fx_exp = hb_synth_fx_exp;