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

try to fix and update remaining files

parent 28bce304

lib_enc/speech_music_classif_fx.c

+4 −4
Original line number Diff line number Diff line
@@ -1548,11 +1548,7 @@ static Word16 attack_det_fx( /* o : attack flag 
        exp1 = norm_s( att_3lsub_pos );

        tmp = div_s( shl( 1, sub( 14, exp1 ) ), att_3lsub_pos ); /*Q(29-exp1) */



#ifdef ISSUE_1799_replace_L_shr_o

        L_tmp = L_shr_sat( finc[0], Qx ); /*Qx */

#else

        L_tmp = L_shr_o( finc[0], Qx, &Overflow );                                           /*Qx */

#endif



        FOR( i = 1; i < att_3lsub_pos; i++ )

        {
@@ -3828,10 +3824,14 @@ static void spec_analysis_fx( 
        test();

        IF( GT_16( peak_idx[k], valey_idx[i] ) && LT_16( peak_idx[k], valey_idx[i + 1] ) )

        {

#ifdef ISSUE_1867_replace_overflow_libenc

            p2v[k] = sub_sat( shl_sat( peak[k], 1 ), add_sat( valley[i], valley[i + 1] ) );

#else

#ifdef ISSUE_1796_replace_shl_o

            p2v[k] = sub_o( shl_sat( peak[k], 1 ), add_o( valley[i], valley[i + 1], &Overflow ), &Overflow );

#else

            p2v[k] = sub_o( shl_o( peak[k], 1, &Overflow ), add_o( valley[i], valley[i + 1], &Overflow ), &Overflow );

#endif

#endif

            move16();

            k = add( k, 1 );

lib_enc/swb_bwe_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1202,11 +1202,7 @@ static Word16 FD_BWE_class_fx( /* o : FD BWE class 
        }



        test();

#ifdef ISSUE_1796_replace_shl_o

        IF( GT_16( sharp, 4608 ) && GT_16( peak, shl_sat( 1, add( Q_syn, 3 ) ) ) )

#else

        IF( GT_16( sharp, 4608 ) && GT_16( peak, shl_o( 1, add( Q_syn, 3 ), &Overflow ) ) )

#endif

        {

            k = add( k, 1 );

            move16();

lib_enc/tcx_utils_enc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -2504,7 +2504,7 @@ void tcx_noise_factor_ivas_fx( 
    Word16 att; /* noise level attenuation factor for transient windows */

    Word32 xMax;

    Word16 exp_spQ[N_MAX];

#if !defined( ISSUE_1867_replace_overflow_libenc ) && !defined( ISSUE_1796_replace_shl_o )

#if !defined( ISSUE_1867_replace_overflow_libenc )

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();

lib_enc/vad_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ Word16 wb_vad_fx( 
    Word32 L_accum_ener_H;

    Word16 vad_bwidth_fx;

    Word16 last_7k2_coder_type;

#if !defined( ISSUE_1867_replace_overflow_libenc ) && !defined( ISSUE_1796_replace_shl_o )

#if !defined( ISSUE_1867_replace_overflow_libenc )

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();

lib_enc/voiced_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ ivas_error ppp_voiced_encoder_fx( 
    Word32 low_band_en_fx;

    Word32 curr_Engy, prev_Engy;

    Word16 temp_Fs;

#if !defined( ISSUE_1867_replace_overflow_libenc ) && !defined( ISSUE_1796_replace_shl_o )

#if !defined( ISSUE_1867_replace_overflow_libenc )

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -1375,7 +1375,7 @@ static Word32 DTFS_freq_corr_fx( 
    Word16 exp, tmp;

    Word32 L_tmp;

    Word16 Q_num, Q_den;

#if !defined( ISSUE_1867_replace_overflow_libenc ) && !defined( ISSUE_1796_replace_shl_o )

#if !defined( ISSUE_1867_replace_overflow_libenc )

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();