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

erase all //??sat comments

parent ee7a4775

lib_com/stat_noise_uv_mod_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ void stat_noise_uv_mod_fx( 
            {

                exctilt = calc_tilt_fx( &Exc2_local[i_subfr], En_shift, L_SUBFR ); /*Q15 */

#ifdef ISSUE_1836_replace_overflow_libcom

                exctilt = mult( shl_sat( sub( TILT_COMP_LIM_FX, min_alpha ), 2 ), exctilt ); /*Q15  */ //??Sat

                exctilt = mult( shl_sat( sub( TILT_COMP_LIM_FX, min_alpha ), 2 ), exctilt ); /*Q15  */ 

#else

                exctilt = mult( shl_o( sub( TILT_COMP_LIM_FX, min_alpha ), 2, &Overflow ), exctilt ); /*Q15  */

#endif
@@ -197,7 +197,7 @@ void stat_noise_uv_mod_fx( 
            tmp_den = shl( tmp_den, tmp_shift );

            tmp_res = div_s( tmp_nom, tmp_den );

#ifdef ISSUE_1836_replace_overflow_libcom

            tmp_res = shl_sat( tmp_res, tmp_shift ); //??Sat

            tmp_res = shl_sat( tmp_res, tmp_shift ); 

#else

            tmp_res = shl_o( tmp_res, tmp_shift, &Overflow );

#endif

lib_enc/acelp_core_switch_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ static void bwe_switch_enc_fx( 
    q_tmp2 = sub( q_tmp1, q_tmp2 );     /*30-q_tmp2 */

    L_tmp1 = L_shl( L_tmp1, sub( q_tmp2, 24 ) );

#ifdef ISSUE_1867_replace_overflow_libenc

    gain_fx = round_fx_sat( Isqrt( L_tmp1 ) ); /*Q12  */ //??sat

    gain_fx = round_fx_sat( Isqrt( L_tmp1 ) ); /*Q12  */ 

#else

    gain_fx = round_fx_o( Isqrt( L_tmp1 ), &Overflow ); /*Q12  */

#endif
@@ -997,7 +997,7 @@ static void bwe_switch_enc_ivas_fx( 
    q_tmp2 = sub( q_tmp1, q_tmp2 );     /*30-q_tmp2 */

    L_tmp1 = L_shl( L_tmp1, sub( q_tmp2, 24 ) );

#ifdef ISSUE_1867_replace_overflow_libenc

    gain_fx = round_fx_sat( Isqrt( L_tmp1 ) ); /*Q12  */ //??sat

    gain_fx = round_fx_sat( Isqrt( L_tmp1 ) ); /*Q12  */ 

#else

    gain_fx = round_fx_o( Isqrt( L_tmp1 ), &Overflow ); /*Q12  */

#endif

lib_enc/acelp_enc_util_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ void E_ACELP_conv( 
        }

        L_tmp = W_sat_l( L_tmp_64 ); /* 4Q11 */

#ifdef ISSUE_1867_replace_overflow_libenc

        cn2[k] = round_fx_sat( L_shl_sat( L_tmp, 5 ) ); /* Q0 */ //??sat //??sat

        cn2[k] = round_fx_sat( L_shl_sat( L_tmp, 5 ) ); /* Q0 */  

#else

        cn2[k] = round_fx_o( L_shl_o( L_tmp, 5, &Overflow ), &Overflow ); /* Q0 */

#endif
@@ -210,7 +210,7 @@ void E_ACELP_conv_ivas_fx( 
        }

        L_tmp = W_sat_l( L_tmp_64 ); /* Qnew + 11 */

#ifdef ISSUE_1867_replace_overflow_libenc

        cn2[k] = round_fx_sat( L_shl_sat( L_tmp, 5 ) ); /* Qnew*/ //??sat   //??sat

        cn2[k] = round_fx_sat( L_shl_sat( L_tmp, 5 ) ); /* Qnew*/    

#else

        cn2[k] = round_fx_o( L_shl_o( L_tmp, 5, &Overflow ), &Overflow ); /* Qnew*/

#endif

lib_enc/analy_sp_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ static void find_enr( 
            /* normalization - corresponds to FFT normalization by 2/L_FFT */

            BASOP_SATURATE_WARNING_OFF_EVS; /* saturation seems to have no effect (tested by simulation) */

#ifdef ISSUE_1867_replace_overflow_libenc

            *ptE = L_shl_sat( Ltmp, diff_scaleM2 ); /* Q_new + QSCALE - 2 */ //??sat

            *ptE = L_shl_sat( Ltmp, diff_scaleM2 ); /* Q_new + QSCALE - 2 */ 

#else

            *ptE = L_shl_o( Ltmp, diff_scaleM2, &Overflow );       /* Q_new + QSCALE - 2 */

#endif

lib_enc/ari_hm_enc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ Word16 SearchPeriodicityIndex_fx( 
        tmp = sub( norm_l( tmp32 ), 1 );

        tmp2 = norm_l( AbsTotal );

#ifdef ISSUE_1867_replace_overflow_libenc

        tmp3 = div_s( round_fx_sat( L_shl( tmp32, tmp ) ), round_fx_sat( L_shl( AbsTotal, tmp2 ) ) ); //??sat  //??sat

        tmp3 = div_s( round_fx_sat( L_shl( tmp32, tmp ) ), round_fx_sat( L_shl( AbsTotal, tmp2 ) ) );   

#else

        tmp3 = div_s( round_fx_o( L_shl_o( tmp32, tmp, &Overflow ), &Overflow ), round_fx_o( L_shl_o( AbsTotal, tmp2, &Overflow ), &Overflow ) );

#endif