Commit 694a9ae0 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

deactivate macro for all the files

parent 237b3fb3

lib_dec/FEC_HQ_core_fx.c

+8 −8
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void Regression_Anal_fx( 
    Word32 L_tmp1, L_tmp2;

    Word16 aindex_fx[MAX_PGF + 1]; // Q0

    Word32 b_p_fx[MAX_PGF + 1];    // Q10

#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1796_replace_shl_o_

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -80,7 +80,7 @@ static void Regression_Anal_fx( 
    {

        b_p_fx[0] = L_add( b_p_fx[0], L_shr( values_fx[i], 2 ) ); /*10 */

        move32();

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

        b_p_fx[1] = L_add( b_p_fx[1], Mult_32_16( values_fx[i], shl_sat( sub( num_pgf, i ), 13 ) ) ); /*10 */

#else

        b_p_fx[1] = L_add( b_p_fx[1], Mult_32_16( values_fx[i], shl_o( sub( num_pgf, i ), 13, &Overflow ) ) ); /*10 */
@@ -168,7 +168,7 @@ void HQ_FEC_processing_fx( 
    Word16 energy_diff_fx; // Q10

    HQ_NBFEC_HANDLE hHQ_nbfec;

    HQ_DEC_HANDLE hHQ_core;

#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1796_replace_shl_o_

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -390,7 +390,7 @@ void HQ_FEC_processing_fx( 


                FOR( j = 0; j < Num_bands_p[i]; j++ )

                {

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

                    hHQ_nbfec->Norm_gain_fx[k] = shl_sat( tmp_fx, 1 );

#else

                    hHQ_nbfec->Norm_gain_fx[k] = shl_o( tmp_fx, 1, &Overflow );
@@ -530,7 +530,7 @@ void ivas_HQ_FEC_Mem_update_fx( 
                L_tmp = L_add( L_tmp, L_shr( normq_fx[k], 3 ) ); /*11*/

                k = add( k, 1 );

            }

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

            tmp_fx = shl_sat( inv_tbl_fx[Num_bands_p[i]], 1 ); /*16*/

#else

            tmp_fx = shl_o( inv_tbl_fx[Num_bands_p[i]], 1, &Overflow ); /*16*/
@@ -823,7 +823,7 @@ void HQ_FEC_Mem_update_fx( 
                L_tmp = L_add( L_tmp, L_shr( normq_fx[k], 3 ) ); /*11*/

                k = add( k, 1 );

            }

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

            tmp_fx = shl_sat( inv_tbl_fx[Num_bands_p[i]], 1 ); /*16*/

#else

            tmp_fx = shl_o( inv_tbl_fx[Num_bands_p[i]], 1, &Overflow ); /*16*/
@@ -1023,7 +1023,7 @@ static Word16 find_best_delay_fx( 
    Word32 min_sq_cross_fx, min_corr_fx;

    Word32 accA_fx, accB_fx;

    Word32 Rxy_fx[MAXDELAY_FEC], Ryy_fx[MAXDELAY_FEC];

#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1796_replace_shl_o_

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -1094,7 +1094,7 @@ static Word16 find_best_delay_fx( 
        L_tmp1 = L_shl( min_sq_cross_fx, exp1 );

        L_tmp2 = L_shl( min_corr_fx, exp2 );

        tmp = div_s( extract_h( L_tmp1 ), extract_h( L_tmp2 ) ); /*15 + exp1 - exp2 */

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

        tmp = shl_sat( tmp, sub( exp2, add( exp1, 1 ) ) ); /*14 */

#else

        tmp = shl_o( tmp, sub( exp2, add( exp1, 1 ) ), &Overflow ); /*14 */

lib_dec/FEC_fx.c

+5 −5
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ void FEC_exc_estim_fx( 


        gainCNG = round_fx( L_shl( L_tmp, sub( exp, 12 ) ) ); /* In Q3 */

    }

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

    tmp1 = shl_sat( st_fx->lp_gainc_fx, 1 );

#else

    tmp1 = shl_o( st_fx->lp_gainc_fx, 1, &Overflow );
@@ -191,7 +191,7 @@ void FEC_exc_estim_fx( 
    {

        test();

        test();

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

        IF( ( LT_16( round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR - 1], 6 ) ), shl_sat( mult( 29491, st_fx->bfi_pitch_fx ), 1 ) ) &&

              GT_16( round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR - 1], 6 ) ), mult( 19661, st_fx->bfi_pitch_fx ) ) ) || /* last pitch coherent with the past  */

            GE_16( st_fx->upd_cnt, MAX_UPD_CNT ) )                                                                                /* or last update too far in the past */
@@ -210,7 +210,7 @@ void FEC_exc_estim_fx( 
    {

        test();

        test();

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

        IF( ( LT_16( round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR16k - 1], 6 ) ), shl_sat( mult( 29491, st_fx->bfi_pitch_fx ), 1 ) ) &&

              GT_16( round_fx( L_shl( st_fx->old_pitch_buf_fx[2 * NB_SUBFR16k - 1], 6 ) ), mult( 19661, st_fx->bfi_pitch_fx ) ) ) || /* last pitch coherent with the past  */

            GE_16( st_fx->upd_cnt, MAX_UPD_CNT ) )                                                                                   /* or last update too far in the past */
@@ -768,7 +768,7 @@ static void pulseRes_preCalc( Word16 *cond1, Word16 *cond2, Word32 *cond3, Word1 
{

    Word16 tmp_pit, tmp_pit_e, tmp_frame, tmp_frame_e;

    Word32 tmp_pit2;

#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1796_replace_shl_o_

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -782,7 +782,7 @@ static void pulseRes_preCalc( Word16 *cond1, Word16 *cond2, Word32 *cond3, Word1 
    tmp_frame = sub( 32767 /*1.f Q15*/, tmp_frame ); /*Q15*/

    BASOP_SATURATE_WARNING_OFF_EVS

    /*To calc Q15 threshold, overflow may happen - do negation and compare with negated value to check also highest possible value*/

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

    tmp_pit = shl_sat( negate( tmp_pit ), tmp_pit_e );

#else

    tmp_pit = shl_o( negate( tmp_pit ), tmp_pit_e, &Overflow );

lib_dec/LD_music_post_filter_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static Word16 norm_lfe( 
{

    Word32 Ltmp;

    Word16 exp2, tmp16, exp3;

#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1796_replace_shl_o_

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

#endif
@@ -925,7 +925,7 @@ static Word16 norm_lfe( 
        exp3 = sub( exp2, 12 + 16 - 3 ); /* if exp2 < 31, means that tmp >= 1.0 */

        /* Need to shl by 3 to take into account the 3 multiplications */

    }

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

    tmp16 = shl_sat( tmp16, exp3 ); /* Result in Q12 */

#else

    tmp16 = shl_o( tmp16, exp3, &Overflow ); /* Result in Q12 */

lib_dec/acelp_core_switch_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ static void decod_gen_voic_core_switch_fx( 
    Word16 *pt1;

    GSC_DEC_HANDLE hGSCDec;

    hGSCDec = st_fx->hGSCDec;

#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1796_replace_shl_o_

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move16();
@@ -968,7 +968,7 @@ static void decod_gen_voic_core_switch_fx( 
    IF( st_fx->prev_bfi )

    {

        /*gain_code = min(gain_code, 0.5f*gain_code+0.5f*st->lp_gainc);*/

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

        gain_code16 = s_min( gain_code16, mac_r( L_mult( 16384, gain_code16 ), shl_sat( 16384 >> 3, st_fx->Q_exc ), st_fx->lp_gainc_fx ) ); /* st_fx->lp_gainc_fx in Q3 >>3 to bring it to Q0 as gain_code16 */

#else

        gain_code16 = s_min( gain_code16, mac_r( L_mult( 16384, gain_code16 ), shl_o( 16384 >> 3, st_fx->Q_exc, &Overflow ), st_fx->lp_gainc_fx ) ); /* st_fx->lp_gainc_fx in Q3 >>3 to bring it to Q0 as gain_code16 */

lib_dec/dec_higher_acelp_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ void transf_cdbk_dec_fx( 
    Word32 L_tmp;

    Word32 dct_code32[L_SUBFR];

    Word16 qdct;

#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1796_replace_shl_o_

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -144,7 +144,7 @@ void transf_cdbk_dec_fx( 
    }

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

    {

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

        code_preQ[i] = shl_sat( code_preQ[i], q_Code_preQ );

#else

        code_preQ[i] = shl_o( code_preQ[i], q_Code_preQ, &Overflow );