Commit 4231bf22 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

try to fix and update remaining files

parent c1d1c3b9

lib_enc/scale_enc_fx.c

+1 −5
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void Preemph_scaled( 
    Word16 mu, shift, QVal;

    Word32 L_tmp, L_maxloc;

    Word16 Q_min;

#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();
@@ -104,11 +104,7 @@ void Preemph_scaled( 
    QVal = shl_sat( 1, sub( 15, bits ) ); //?sat

#else

    Overflow = 0;

#ifdef ISSUE_1796_replace_shl_o

    QVal = shl_sat( 1, sub( 15, bits ) );

#else

    QVal = shl_o( 1, sub( 15, bits ), &Overflow );

#endif

#endif

    BASOP_SATURATE_WARNING_ON_EVS

    mu = shr( Preemph_factor, bits ); /* Q15 --> Q(15-bits) */

lib_enc/set_impulse_fx.c

+1 −5
Original line number Diff line number Diff line
@@ -226,11 +226,7 @@ void set_impulse_fx( 


            num = div_s( num, den );



#ifdef ISSUE_1867_replace_overflow_libenc

            krit_fx = shr_sat( num, sub( sub( shl_sat( exp_num, 1 ), exp_den ), 2 ) ); /* Q18 */ //??sat

#else

            krit_fx = shr_sat( num, sub( sub( shl_o( exp_num, 1, &Overflow ), exp_den ), 2 ) );                                          /* Q18 */

#endif

            krit_fx = shr_sat( num, sub( sub( shl_sat( exp_num, 1 ), exp_den ), 2 ) ); /* Q18 */



            IF( GT_16( krit_fx, krit_max_fx ) )

            {

lib_enc/speech_music_classif_fx.c

+6 −2
Original line number Diff line number Diff line
@@ -1548,7 +1548,11 @@ 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++ )

        {

lib_enc/swb_bwe_enc_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -1093,20 +1093,12 @@ static Word16 FD_BWE_class_fx( /* o : FD BWE class 
                expd = sub( sub( 30, expd ), shl( st_fx->prev_Q_shb, 1 ) );



                scale = shr( sub( den, num ), 15 );

#ifdef ISSUE_1796_replace_shl_o

                num = shl_sat( num, scale );

#else

                num = shl_o( num, scale, &Overflow );

#endif

                expn = sub( expn, scale );



                tmp = div_s( num, den );

                expn = sub( expn, expd );

#ifdef ISSUE_1796_replace_shl_o

                gain_tmp = shl_sat( tmp, sub( expn, 1 ) ); /*Q14 */

#else

                gain_tmp = shl_o( tmp, sub( expn, 1 ), &Overflow );                       /*Q14 */

#endif

            }

            test();

            IF( EQ_16( hBWE_FD->prev_mode, TRANSIENT ) )