Commit ae2e3d95 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

corrected wrong macro - some more fixes

parent bd4109ff

lib_enc/cod_tcx_fx.c

+4 −4
Original line number Diff line number Diff line
@@ -1657,7 +1657,7 @@ void QuantizeSpectrum_fx( 


            tmp1 = BASOP_Util_Divide1616_Scale( sqTargetBits, tmp1, &tmp2 );

            BASOP_SATURATE_WARNING_OFF_EVS

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

            hTcxEnc->tcx_target_bits_fac = shl_sat( mult( hTcxEnc->tcx_target_bits_fac, tmp1 ), tmp2 ); //??sat

#else

            hTcxEnc->tcx_target_bits_fac = shl_o( mult( hTcxEnc->tcx_target_bits_fac, tmp1 ), tmp2, &Overflow );
@@ -3256,7 +3256,7 @@ void QuantizeTCXSpectrum_fx( 


        tmp1 = BASOP_Util_Divide1616_Scale( sqTargetBits, tmp1, &tmp2 );

        BASOP_SATURATE_WARNING_OFF_EVS

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

        hTcxEnc->tcx_target_bits_fac = shl_sat( mult( hTcxEnc->tcx_target_bits_fac, tmp1 ), tmp2 ); //??sat

#else

        hTcxEnc->tcx_target_bits_fac = shl_o( mult( hTcxEnc->tcx_target_bits_fac, tmp1 ), tmp2, &Overflow );
@@ -4023,7 +4023,7 @@ void InternalTCXDecoder_fx( 
    Word16 Aq_old_fx[M + 1];

    Word32 sns_interpolated_scalefactors_fx[FDNS_NPTS], A_fx32[M + 1];

    Word16 *xn_buf16 = (Word16 *) xn_buf32;

#if !defined( ISSUE_1836_replace_overflow_libcom )

#if !defined( ISSUE_1867_replace_overflow_libenc )

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -4677,7 +4677,7 @@ void InternalTCXDecoder_fx( 
            BASOP_SATURATE_WARNING_OFF_EVS;

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

            {

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

                xn_buf16[i] = shl_sat( xn_buf16[i], TCX_IMDCT_HEADROOM ); //??sat

#else

                xn_buf16[i] = shl_o( xn_buf16[i], TCX_IMDCT_HEADROOM, &Overflow );

lib_enc/core_enc_ol_fx.c

+9 −9
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ void core_encode_openloop_fx( 
    Word16 lsp_old_q_rf[M + 1], lsf_old_q_rf[M + 1];

    (void) vad_hover_flag;

    (void) vad_flag_dtx;

#ifndef ISSUE_1836_replace_overflow_libcom

#ifndef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -555,7 +555,7 @@ void core_encode_openloop_fx( 
            /*v_sub(lsf_uq_rf, lsf_q_1st_rf, lsf_q_d_rf, M);*/

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

            {

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

                lsf_q_d_rf[i] = shl_sat( mult_r( sub_sat( lsf_uq_rf[i], lsf_q_1st_rf[i] ), 25600 ), 5 ); //??sat

#else

                lsf_q_d_rf[i] = shl_o( mult_r( sub_o( lsf_uq_rf[i], lsf_q_1st_rf[i], &Overflow ), 25600 ), 5, &Overflow );
@@ -760,7 +760,7 @@ static void closest_centroid_rf( 
    Word16 tmp, tmpL;

    Word64 werr_64;

    Word32 L_tmp, best_werr, werr;

#ifdef ISSUE_1836_replace_overflow_libcom

#ifndef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -780,7 +780,7 @@ static void closest_centroid_rf( 
        tmpL = i_mult2( i, length );

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

        {

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

            tmp = sub_sat( data[j], quantizer[tmpL + j] ); //??sat

            L_tmp = L_mult_sat( tmp, tmp );                //??sat

#else
@@ -838,7 +838,7 @@ void core_acelp_tcx20_switching_fx( 
    Word16 snr_tcx, snr_acelp, dsnr;

    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;

    SP_MUS_CLAS_HANDLE hSpMusClas = st->hSpMusClas;

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -1119,7 +1119,7 @@ void core_acelp_tcx20_switching_fx( 


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

            {

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

                tmp32 = L_mac0_sat( tmp32, st->wspeech_enc[i + j], st->wspeech_enc[i + j] ); //??sat

#else

                tmp32 = L_mac0_o( tmp32, st->wspeech_enc[i + j], st->wspeech_enc[i + j], &Overflow );
@@ -1141,7 +1141,7 @@ void core_acelp_tcx20_switching_fx( 
        tcx_snr = L_shl( Mpy_32_16_1( tcx_snr, 0x6054 ), 2 ); /* 0x6054 -> 10/log2(10) (2Q13) */



        BASOP_SATURATE_WARNING_OFF_EVS

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

        snr_tcx = round_fx_sat( L_shl_sat( tcx_snr, 8 ) ); /* 7Q8 */ //??sat   //??sat

#else

        snr_tcx = round_fx_o( L_shl_o( tcx_snr, 8, &Overflow ), &Overflow ); /* 7Q8 */
@@ -1179,7 +1179,7 @@ void core_acelp_tcx20_switching_fx( 


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

            {

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

                signal = L_mac0_sat( signal, st->wspeech_enc[i + j], st->wspeech_enc[i + j] ); //??sat



                tmp16 = round_fx_sat( L_shl_sat( Mpy_32_16_r( gain, st->wspeech_enc[i + j - T0] ), 15 ) ); //??sat
@@ -1244,7 +1244,7 @@ void core_acelp_tcx20_switching_fx( 
        test();

        if ( ( GT_16( snr_acelp, snr_tcx ) ) &&

             ( LT_16( snr_acelp, add( snr_tcx, 512 /*2.0f Q8*/ ) ) ) &&

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

             ( LT_16( add_sat( st->prevTempFlatness_fx, currFlatness ), 416 /*3.25f Q7*/ ) || EQ_16( stab_fac, 0x7fff /*1 Q15*/ ) || //??sat

#else

             ( LT_16( add_o( st->prevTempFlatness_fx, currFlatness, &Overflow ), 416 /*3.25f Q7*/ ) || EQ_16( stab_fac, 0x7fff /*1 Q15*/ ) ||

lib_enc/corr_xh_fx.c

+10 −10
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ void corr_xh_fx( 
{

    Word16 i, j, k;

    Word32 L_tmp, y32[L_SUBFR], L_maxloc, L_tot;

#ifndef ISSUE_1836_replace_overflow_libcom

#ifndef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move16();
@@ -49,8 +49,8 @@ void corr_xh_fx( 
            L_tmp = L_mac( 1L, x[i], h[0] ); /* 1 -> to avoid null dn[] Qx+15*/

            FOR( j = i; j < L_SUBFR - 1; j++ )

            {

#ifdef ISSUE_1836_replace_overflow_libcom

                L_tmp = L_mac_o( L_tmp, x[j + 1], h[j + 1 - i], &Overflow ); /*Qx+15*/

#ifdef ISSUE_1867_replace_overflow_libenc

                L_tmp = L_mac_sat( L_tmp, x[j + 1], h[j + 1 - i] ); /*Qx+15*/   //??sat

#else

                L_tmp = L_mac_o( L_tmp, x[j + 1], h[j + 1 - i], &Overflow );                     /*Qx+15*/

#endif
@@ -63,7 +63,7 @@ void corr_xh_fx( 
        }

        /* tot += 3*max / 8 */

        L_maxloc = L_shr( L_maxloc, 2 );

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

        L_tot = L_add_sat( L_tot, L_maxloc ); /* +max/4 */             //??sat

        L_tot = L_add_sat( L_tot, L_shr( L_maxloc, 1 ) ); /* +max/8 */ //??sat

#else
@@ -93,7 +93,7 @@ void corr_hh_ivas_fx( 
{

    Word16 i, j, k;

    Word32 L_tmp, y32[L_SUBFR * 2], L_maxloc, L_tot;

#ifndef ISSUE_1836_replace_overflow_libcom

#ifndef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move16();
@@ -111,7 +111,7 @@ void corr_hh_ivas_fx( 
            L_tmp = L_mac( 1L, shr( h[i], 3 ), shr( h[0], 3 ) ); /* 1 -> to avoid null dn[] */ // 2*(15 - norm_s(h[0]) -3) - 1

            FOR( j = i; j < L_subfr - 1; j++ )

            {

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

                L_tmp = L_mac_sat( L_tmp, shr( h[j + 1], 3 ), shr( h[j + 1 - i], 3 ) ); // 2*(15 - norm_s(h[0]) -3) - 1   //?sat

#else

                L_tmp = L_mac_o( L_tmp, shr( h[j + 1], 3 ), shr( h[j + 1 - i], 3 ), &Overflow ); // 2*(15 - norm_s(h[0]) -3) - 1
@@ -125,7 +125,7 @@ void corr_hh_ivas_fx( 
        }

        /* tot += 3*max / 8 */

        L_maxloc = L_shr( L_maxloc, 2 );

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

        L_tot = L_add_sat( L_tot, L_maxloc ); /* +max/4 */             //??sat

        L_tot = L_add_sat( L_tot, L_shr( L_maxloc, 1 ) ); /* +max/8 */ //??sat

#else
@@ -161,7 +161,7 @@ void corr_xh_ivas_fx( 
{

    Word16 i, j, k;

    Word32 L_tmp, y32[L_SUBFR * 2], L_maxloc, L_tot;

#ifndef ISSUE_1836_replace_overflow_libcom

#ifndef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move16();
@@ -179,7 +179,7 @@ void corr_xh_ivas_fx( 
            L_tmp = L_mac( 0, x[i], h[0] ); // Qx+(14 - norm_s(h[0])) + 1

            FOR( j = i; j < L_subfr - 1; j++ )

            {

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

                L_tmp = L_mac_sat( L_tmp, x[j + 1], h[j + 1 - i] ); // Qx+(14 - norm_s(h[0])) + 1   //??sat

#else

                L_tmp = L_mac_o( L_tmp, x[j + 1], h[j + 1 - i], &Overflow );                     // Qx+(14 - norm_s(h[0])) + 1
@@ -193,7 +193,7 @@ void corr_xh_ivas_fx( 
        }

        /* tot += 3*max / 8 */

        L_maxloc = L_shr( L_maxloc, 2 );

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

        L_tot = L_add_sat( L_tot, L_maxloc ); /* +max/4 */             //??sat

        L_tot = L_add_sat( L_tot, L_shr( L_maxloc, 1 ) ); /* +max/8 */ //??sat

#else

lib_enc/detect_transient_fx.c

+14 −14
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static void hp_filter_fx( 
{

    Word16 i;

    Word32 L_tmp;

#ifdef ISSUE_1836_replace_overflow_libcom

#ifndef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -71,7 +71,7 @@ static void hp_filter_fx( 




    /*y[0] = 0.4931f * *oldy + 0.7466f*(x[0] - *oldx); */

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

    L_tmp = L_mult( sub_sat( x[0], *oldx ), 24465 /*0.7466f in Q15*/ ); /*Q_new+16 */ //??sat

#else

    L_tmp = L_mult( sub_o( x[0], *oldx, &Overflow ), 24465 /*0.7466f in Q15*/ );        /*Q_new+16 */
@@ -81,7 +81,7 @@ static void hp_filter_fx( 
    FOR( i = 1; i < L; i++ )

    {

        /*y[i] = 0.4931f*y[i-1] + 0.7466f*(x[i] - x[i-1]); */

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

        L_tmp = L_mult( sub_sat( x[i], x[i - 1] ), 24465 /*0.7466f in Q15*/ ); /*Q_new+16 */ //??sat

        L_tmp = L_mac_sat( L_tmp, y[i - 1], 16158 /*0.4931f in Q15*/ ); /*Q_new+16 */        //??sat

        y[i] = round_fx_sat( L_tmp ); /*Q_new */                                             //??sat
@@ -129,7 +129,7 @@ Word16 detect_transient_fx( 
    Word32 E_low_fx, E_high_fx;

    Word16 temp16, Thres_fx = 0;

    Word16 exp;

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -165,7 +165,7 @@ Word16 detect_transient_fx( 
        FOR( i = 0; i < L / 4; i++ )

        {

            /*EnergyLT += out_filt[i] * out_filt[i]; */

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

            EnergyLT = L_mac0_sat( EnergyLT, out_filt_fx[i], out_filt_fx[i] ); /*2Q_new */ //??sat

#else

            EnergyLT = L_mac0_o( EnergyLT, out_filt_fx[i], out_filt_fx[i], &Overflow ); /*2Q_new */
@@ -188,13 +188,13 @@ Word16 detect_transient_fx( 
            FOR( i = 0; i < L / 4; i++ )

            {

                temp16 = extract_l( L_shr( out_filt_fx[i + blk * ( L / 4 )], 12 ) );

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

                Energy_fx = L_add_sat( Energy_fx, L_mult0( temp16, temp16 ) ); //??sat

#else

                Energy_fx = L_add_o( Energy_fx, L_mult0( temp16, temp16 ), &Overflow );

#endif

                temp16 = shr( in_fx[i + blk * ( L / 4 )], Q_new ); /*Q0*/

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

                Energy_in_fx[blk + 1] = L_add_sat( Energy_in_fx[blk + 1], L_mult0( temp16, temp16 ) ); /*Q0*/ //??sat

#else

                Energy_in_fx[blk + 1] = L_add_o( Energy_in_fx[blk + 1], L_mult0( temp16, temp16 ), &Overflow );                                        /*Q0*/
@@ -202,7 +202,7 @@ Word16 detect_transient_fx( 
                move32();

            }



#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

            E_in_fx = L_add_sat( E_in_fx, Energy_in_fx[blk + 1] ); /*Q0*/ //??sat

            E_out_fx = L_add_sat( E_out_fx, Energy_fx ); /*Q0*/           //??sat

#else
@@ -232,7 +232,7 @@ Word16 detect_transient_fx( 
            FOR( i = 0; i < L / 8; i++ )

            {

                /*Energy += out_filt_fx[i + blk*(L/4)] * out_filt_fx[i + blk*(L/4)]; */

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

                L_tmp = L_mac0_sat( L_tmp, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )] ); /*2Q_new */ //??sat

#else

                L_tmp = L_mac0_o( L_tmp, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )], &Overflow );                              /*2Q_new */
@@ -242,10 +242,10 @@ Word16 detect_transient_fx( 
            FOR( ; i < L / 4; i++ )

            {

                /*Energy += out_filt_fx[i + blk*(L/4)] * out_filt_fx[i + blk*(L/4)]; */

#ifdef ISSUE_1836_replace_overflow_libcom

                L_tmp2 = L_mac0_sat( L_tmp2D, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )] ); /*2Q_new */ //??sat

#ifdef ISSUE_1867_replace_overflow_libenc

                L_tmp2 = L_mac0_sat( L_tmp2, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )] ); /*2Q_new */ //??sat

#else

                L_tmp2 = L_mac0_o( L_tmp2D, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )], &Overflow );                           /*2Q_new */

                L_tmp2 = L_mac0_o( L_tmp2, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )], &Overflow );                           /*2Q_new */

#endif

            }

            Overflow = 0;
@@ -257,7 +257,7 @@ Word16 detect_transient_fx( 
                shift = 1;

                move16();

            }

#ifndef ISSUE_1836_replace_overflow_libcom

#ifndef ISSUE_1867_replace_overflow_libenc

            Overflow = 0;

            move16();
@@ -305,7 +305,7 @@ Word16 detect_transient_fx( 
            }

            /*EnergyLT = 0.75f*EnergyLT + 0.25f*Energy;				 */

            /*0.75f*EnergyLT in Q0                         //0.25f*Energy in Q0			 */

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

            EnergyLT = L_add_sat( Mult_32_16( EnergyLT, 24576 /*0.75f in Q15*/ ), Mult_32_16( Energy, shl( 8192 /*0.25 in Q15*/, shift ) ) ); /*2Q_new */ //??sat

#else

            EnergyLT = L_add_o( Mult_32_16( EnergyLT, 24576 /*0.75f in Q15*/ ), Mult_32_16( Energy, shl( 8192 /*0.25 in Q15*/, shift ) ), &Overflow ); /*2Q_new */

lib_enc/dtx_fx.c

+10 −10
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ void dtx_ivas_fx( 
    TD_CNG_ENC_HANDLE hTdCngEnc = st_fx->hTdCngEnc;



    Word16 last_br_cng_flag, last_br_flag, br_dtx_flag;

#ifndef ISSUE_1836_replace_overflow_libcom

#ifndef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -463,7 +463,7 @@ void dtx_ivas_fx( 
                speech++;

                FOR( i = 1; i < L_FRAME / 16; i++ )

                {

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

                    L_tmp = L_mac0_sat( L_tmp, *speech, *speech ); /*2*Q_speech*/ //??sat

#else

                    L_tmp = L_mac0_o( L_tmp, *speech, *speech, &Overflow );                                                    /*2*Q_speech*/
@@ -637,7 +637,7 @@ void dtx_fx( 
    TD_CNG_ENC_HANDLE hTdCngEnc = st_fx->hTdCngEnc;



    Word16 last_br_cng_flag, last_br_flag, br_dtx_flag;

#ifndef ISSUE_1836_replace_overflow_libcom

#ifndef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -939,7 +939,7 @@ void dtx_fx( 
                speech++;

                FOR( i = 1; i < L_FRAME / 16; i++ )

                {

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

                    L_tmp = L_mac0_sat( L_tmp, *speech, *speech ); /*2*Q_speech*/ //??sat

#else

                    L_tmp = L_mac0_o( L_tmp, *speech, *speech, &Overflow );                                                    /*2*Q_speech*/
@@ -1248,7 +1248,7 @@ void dtx_hangover_control_fx( 
    VAD_HANDLE hVAD = st_fx->hVAD;

    DTX_ENC_HANDLE hDtxEnc = st_fx->hDtxEnc;

    TD_CNG_ENC_HANDLE hTdCngEnc = st_fx->hTdCngEnc;

#ifndef ISSUE_1836_replace_overflow_libcom

#ifndef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

#endif
@@ -1421,7 +1421,7 @@ void dtx_hangover_control_fx( 
            move16();

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

            {

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

                lsp_est[i] = add_sat( lsp_est[i], tmp[j * M + i] ); /*Q15 */ //??sat

#else

                lsp_est[i] = add_o( lsp_est[i], tmp[j * M + i], &Overflow );                                                   /*Q15 */
@@ -1441,14 +1441,14 @@ void dtx_hangover_control_fx( 
            move16();

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

            {

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

                lsp_est[i] = add_sat( lsp_est[i], tmp[j * M + i] ); /*Q15 */ //??sat

#else

                lsp_est[i] = add_o( lsp_est[i], tmp[j * M + i], &Overflow );                                                   /*Q15 */

#endif

            }



#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

            lsp_est[i] = sub_sat( lsp_est[i], add_sat( tmp[max_idx[0] * M + i], tmp[max_idx[1] * M + i] ) ); /*Q15 */ //??sat

#else

            lsp_est[i] = sub_o( lsp_est[i], add_o( tmp[max_idx[0] * M + i], tmp[max_idx[1] * M + i], &Overflow ), &Overflow ); /*Q15 */
@@ -1462,7 +1462,7 @@ void dtx_hangover_control_fx( 
    move16();

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

    {

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

        Dlsp_n2e = add_sat( Dlsp_n2e, abs_s( sub( lsp_new_fx[i], lsp_est[i] ) ) ); /*Q15 */ //??sat

#else

        Dlsp_n2e = add_o( Dlsp_n2e, abs_s( sub( lsp_new_fx[i], lsp_est[i] ) ), &Overflow );                                    /*Q15 */
@@ -1479,7 +1479,7 @@ void dtx_hangover_control_fx( 
    FOR( i = 0; i < M; i++ )

    {

        S_tmp = abs_s( sub( hDtxEnc->lspCNG_fx[i], lsp_est[i] ) ); /*Q15 */

#ifdef ISSUE_1836_replace_overflow_libcom

#ifdef ISSUE_1867_replace_overflow_libenc

        Dlsp = add_sat( Dlsp, S_tmp ); /*Q15 */ //??sat

#else

        Dlsp = add_o( Dlsp, S_tmp, &Overflow );                                                                                /*Q15 */