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

reviewed 'till q*

parent fa50fd2c

lib_enc/nois_est_fx.c

+24 −26
Original line number Diff line number Diff line
@@ -107,12 +107,10 @@ static Word16 noise_est_ln_q8_fx( 
    Flag Overflow = 0;

    move32();

#endif

#endif



#ifdef ISSUE_1867_replace_overflow_libenc

    L_tmp = L_add_sat( L_enr, L_shl( (Word32) 1L, q_new_plus_q_scale ) ); /*  +1.0f */ //??sat

#else

    L_tmp = L_add_o( L_enr, L_shl( (Word32) 1L, q_new_plus_q_scale ), &Overflow ); /*  +1.0f */

#else

    L_tmp = L_add_sat( L_enr, L_shl( (Word32) 1L, q_new_plus_q_scale ) ); /*  +1.0f */ //??sat

#endif

    if ( flag_add1p0 == 0 )

    {
@@ -2625,8 +2623,8 @@ void noise_est_ivas_fx( 
    {

        /* ftemp2 /= ftemp */

        num = div_s( extract_h( Ltmp2 ), extract_h( Ltmp ) ); // 15+exp2-exp

#ifdef ISSUE_1867_replace_overflow_libenc

        noise_chartmp = shl_sat( num, sub( sub( exp, exp2 ), 4 ) ); // 15+exp2-exp1 -> Q11  //??sat

#ifdef ISSUE_1796_replace_shl_o

        noise_chartmp = shl_sat( num, sub( sub( exp, exp2 ), 4 ) ); // 15+exp2-exp1 -> Q11

#else

        noise_chartmp = shl_o( num, sub( sub( exp, exp2 ), 4 ), &Overflow ); // 15+exp2-exp1 -> Q11

#endif

lib_enc/pitch_ol2_fx.c

+12 −12
Original line number Diff line number Diff line
@@ -315,27 +315,27 @@ void StableHighPitchDetect_fx( 
            tmp = abs_s( tmp );

            tmp = div_s( 16384, tmp ); /*Q(15+exp)*/

            BASOP_SATURATE_WARNING_OFF_EVS

            diff = L_negate( L_shr_sat( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) ) );

#ifdef ISSUE_1867_replace_overflow_libenc

            diff = L_negate( L_shr_sat( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) ) ); //??sat

            BASOP_SATURATE_WARNING_ON_EVS

            diff16 = round_fx_sat( diff );                                               //??sat

#else

            diff = L_negate( L_shr_o( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ), &Overflow ) );

            BASOP_SATURATE_WARNING_ON_EVS

            diff16 = round_fx_o( diff, &Overflow );

#endif

            BASOP_SATURATE_WARNING_ON_EVS

        }

        ELSE

        {

            tmp = div_s( 16384, tmp ); /*Q(15+exp)*/

            BASOP_SATURATE_WARNING_OFF_EVS

            diff = L_shr_sat( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) );

#ifdef ISSUE_1867_replace_overflow_libenc

            diff = L_shr_sat( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) ); //??sat

            BASOP_SATURATE_WARNING_ON_EVS

            diff16 = round_fx_sat( diff );                                   //??sat

#else

            diff = L_shr_o( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ), &Overflow );

            BASOP_SATURATE_WARNING_ON_EVS

            diff16 = round_fx_o( diff, &Overflow );

#endif

            BASOP_SATURATE_WARNING_ON_EVS

        }

    }

    ELSE
@@ -550,27 +550,27 @@ void StableHighPitchDetect_ivas_fx( 
            tmp = abs_s( tmp );

            tmp = div_s( 16384, tmp ); /*Q(15+exp)*/

            BASOP_SATURATE_WARNING_OFF_EVS

            diff = L_negate( L_shr_sat( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) ) );

#ifdef ISSUE_1867_replace_overflow_libenc

            diff = L_negate( L_shr_sat( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) ) ); //??sat

            BASOP_SATURATE_WARNING_ON_EVS

            diff16 = round_fx_sat( diff );                                               //??sat

#else

            diff = L_negate( L_shr_o( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ), &Overflow ) );

            BASOP_SATURATE_WARNING_ON_EVS

            diff16 = round_fx_o( diff, &Overflow );

#endif

            BASOP_SATURATE_WARNING_ON_EVS

        }

        ELSE

        {

            tmp = div_s( 16384, tmp ); /*Q(15+exp)*/

            BASOP_SATURATE_WARNING_OFF_EVS

            diff = L_shr_sat( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) );

#ifdef ISSUE_1867_replace_overflow_libenc

            diff = L_shr_sat( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) ); //??sat

            BASOP_SATURATE_WARNING_ON_EVS

            diff16 = round_fx_sat( diff );                                   //??sat

#else

            diff = L_shr_o( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ), &Overflow );

            BASOP_SATURATE_WARNING_ON_EVS

            diff16 = round_fx_o( diff, &Overflow );

#endif

            BASOP_SATURATE_WARNING_ON_EVS

        }

    }

    ELSE

lib_enc/pitch_ol_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -1730,6 +1730,7 @@ void pitch_ol_ivas_fx( 
#ifdef ISSUE_1867_replace_overflow_libenc

            corX[i][j] = extract_h( L_shl_sat( Ltmp, add( enr1_exp, cor_buf_exp[ind] ) ) ); // Q15  //??sat

#else



            corX[i][j] = extract_h( L_shl_o( Ltmp, add( enr1_exp, cor_buf_exp[ind] ), &Overflow ) ); // Q15

#endif

            move16();

lib_enc/pre_proc_fx.c

+2 −4
Original line number Diff line number Diff line
@@ -127,12 +127,10 @@ void pre_proc_fx( 
    FD_BWE_ENC_HANDLE hBWE_FD = st->hBWE_FD;



#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move16();

#endif

#endif

#endif



    /*------------------------------------------------------------------*
@@ -1050,8 +1048,8 @@ void pre_proc_fx( 
    test();

    IF( ( ( st->tcxonly == 0 ) || ( EQ_16( st->codec_mode, MODE1 ) ) ) && GT_32( st->input_Fs, 8000 ) )

    {

#ifdef ISSUE_1867_replace_overflow_libenc

        st->mem_preemph_enc = shl_sat( new_inp_16k[sub( L_frame_tmp, 1 )], 1 ); //??sat

#ifdef ISSUE_1796_replace_shl_o

        st->mem_preemph_enc = shl_sat( new_inp_16k[sub( L_frame_tmp, 1 )], 1 );

#else

        st->mem_preemph_enc = shl_o( new_inp_16k[sub( L_frame_tmp, 1 )], 1, &Overflow );

#endif

lib_enc/pvq_core_enc_fx.c

+12 −12
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ void pvq_encode_frame_ivas_fx( 
    Word32 xy_corr, yy_corr;

    PVQ_ENC_DATA pvq_enc;

    PVQ_ENC_HANDLE hPVQ = &pvq_enc;

#ifndef ISSUE_1867_replace_overflow_libenc

#ifndef ISSUE_1796_replace_shl_o

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move16();
@@ -333,8 +333,8 @@ void pvq_encode_frame_ivas_fx( 
            }



            tmp = ratio( xy_corr, yy_corr, &exp );

#ifdef ISSUE_1867_replace_overflow_libenc

            gopt[is] = shl_sat( tmp, sub( sub( sub( 14, Q_coefs ), shift ), exp ) ); //??sat

#ifdef ISSUE_1796_replace_shl_o

            gopt[is] = shl_sat( tmp, sub( sub( sub( 14, Q_coefs ), shift ), exp ) );

#else

            gopt[is] = shl_o( tmp, sub( sub( sub( 14, Q_coefs ), shift ), exp ), &Overflow );

#endif
@@ -397,7 +397,7 @@ void pvq_encode_frame_fx( 
    Word32 xy_corr, yy_corr;

    PVQ_ENC_DATA pvq_enc;

    PVQ_ENC_HANDLE hPVQ = &pvq_enc;

#ifndef ISSUE_1867_replace_overflow_libenc

#ifndef ISSUE_1796_replace_shl_o

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move16();
@@ -463,8 +463,8 @@ void pvq_encode_frame_fx( 
            }



            tmp = ratio( xy_corr, yy_corr, &exp );

#ifdef ISSUE_1867_replace_overflow_libenc

            gopt[is] = shl_sat( tmp, sub( sub( sub( 14, Q_coefs ), shift ), exp ) ); //??sat

#ifdef ISSUE_1796_replace_shl_o

            gopt[is] = shl_sat( tmp, sub( sub( sub( 14, Q_coefs ), shift ), exp ) );

#else

            gopt[is] = shl_o( tmp, sub( sub( sub( 14, Q_coefs ), shift ), exp ), &Overflow );

#endif
@@ -943,7 +943,7 @@ static void densityIndexSymbolEncode_ivas_fx( 
    Word32 sym_freq, cum_freq, tot;

    Word32 acc;

    UWord16 lsb;

#ifndef ISSUE_1867_replace_overflow_libenc

#ifndef ISSUE_1796_replace_shl_o

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move16();
@@ -955,8 +955,8 @@ static void densityIndexSymbolEncode_ivas_fx( 
    IF( s_and( (Word16) 0xFFFE, density ) != 0 ) /* even */

    {

        angle = atan2_fx( SQRT_DIM_fx[r_dim], SQRT_DIM_fx[l_dim] );

#ifdef ISSUE_1867_replace_overflow_libenc

        angle = shl_sat( angle, 1 ); //??sat

#ifdef ISSUE_1796_replace_shl_o

        angle = shl_sat( angle, 1 );

#else

        angle = shl_o( angle, 1, &Overflow );

#endif
@@ -1026,7 +1026,7 @@ static void densityIndexSymbolEncode_fx( 
    Word32 sym_freq, cum_freq, tot;

    Word32 acc;

    UWord16 lsb;

#ifndef ISSUE_1867_replace_overflow_libenc

#ifndef ISSUE_1796_replace_shl_o

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move16();
@@ -1038,8 +1038,8 @@ static void densityIndexSymbolEncode_fx( 
    IF( s_and( (Word16) 0xFFFE, density ) != 0 ) /* even */

    {

        angle = atan2_fx( SQRT_DIM_fx[r_dim], SQRT_DIM_fx[l_dim] );

#ifdef ISSUE_1867_replace_overflow_libenc

        angle = shl_sat( angle, 1 ); //??sat

#ifdef ISSUE_1796_replace_shl_o

        angle = shl_sat( angle, 1 );

#else

        angle = shl_o( angle, 1, &Overflow );

#endif