Commit 8c1df91e authored by vaillancour's avatar vaillancour
Browse files

more fixes for hi-level content

parent b6abe1f6

lib_com/fd_cng_com_fx.c

+5 −1
Original line number Diff line number Diff line
@@ -574,7 +574,11 @@ void minimum_statistics ( 
            {

                /* calculate scalar with normalized msPeriodogSum[cnt], exponent -2*s1 */

                s1 = norm_l(msPeriodogSum[cnt]);

#ifdef BASOP_NOGLOB

                msPeriodogSum16 = round_fx_sat( L_shl_sat( msPeriodogSum[cnt], s1 ) );

#else

                msPeriodogSum16 = round_fx( L_shl( msPeriodogSum[cnt], s1 ) );

#endif

                scalar = L_mult(msPeriodogSum16, msPeriodogSum16);



                /* calculate difference, both elements in 16Q15 format, use absolute value

lib_com/interpol.c

+5 −2
Original line number Diff line number Diff line
@@ -109,8 +109,11 @@ Word32 Interpol_lc_fx( /* o : interpolated value Qx+16 */ 
    }

    L_sum = W_sat_l(L_sum64);

  }

#ifdef BASOP_NOGLOB

  L_sum = L_shl_sat( L_sum, 1 );

#else

  L_sum = L_shl( L_sum, 1 );



#endif

  return L_sum;

}

lib_com/stat_noise_uv_mod_fx.c

+5 −2
Original line number Diff line number Diff line
@@ -403,8 +403,11 @@ static Word16 calc_tilt_fx( /* o : Excitation tilt Q15*/ 
    r1 = L_abs(r1);



    L_tmp_res = Div_32(r1,extract_h(r0), extract_l(r0));

#ifdef BASOP_NOGLOB

    L_tmp_res = L_shl_sat( L_tmp_res, tmp_shift ); /*Q31 */

#else

    L_tmp_res = L_shl( L_tmp_res, tmp_shift ); /*Q31 */



#endif

    if (tmp_sign != 0)

    {

        L_tmp_res = L_negate(L_tmp_res); /*Q31 */

lib_com/swb_bwe_com_fx.c

+5 −1
Original line number Diff line number Diff line
@@ -1418,7 +1418,11 @@ void SWB_BWE_decoding_fx( 
		L_tmp = L_deposit_h(tmp);

		L_tmp = Isqrt_lc(L_tmp, &exp);



#ifdef BASOP_NOGLOB

        fenvL_16 = round_fx_sat( L_shl_sat( L_tmp, sub( exp, 12 ) ) ); /* Q3 */

#else

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

#endif

	}

#ifdef BASOP_NOGLOB

    IF( GT_16( fenvL_16, shl_sat( SWB_fenv[0], 5 ) ) )

lib_com/tools_fx.c

+4 −1
Original line number Diff line number Diff line
@@ -2012,8 +2012,11 @@ void pz_filter_sp_fx ( 
        Lacc = L_deposit_h( x[i] ); /* Lacc in Q(16+Qn)*/

        Lacc = L_shl( Lacc, s );   /* Lacc=x[i] in Q(16+Qn-2Qa+1)*/

        FOR ( j = PDR - 1; j >= 0; j-- )

#ifdef BASOP_NOGLOB

        Lacc = L_msu_sat( Lacc, buf[j], a[j + 1] ); /*Q(16+Qn-2Qa+1)*/

#else

        Lacc = L_msu( Lacc, buf[j], a[j + 1] ); /*Q(16+Qn-2Qa+1)*/



#endif





        Lacc = L_shr( Lacc, 1 );