Commit 924879c7 authored by vaillancour's avatar vaillancour
Browse files

Correction on compl saturations for 26.444

parent 0587f9d3

lib_com/cng_exc_fx.c

+6 −1
Original line number Diff line number Diff line
@@ -383,8 +383,13 @@ void CNG_exc_fx( 
            /* itmp[i] += own_random( cng_ener_seed1 )*denv[i]*0.000011f + denv[i]; */

            L_tmp = Mult_32_16(denv[i], Random(cng_ener_seed1));

            L_tmp = Mult_32_16(L_tmp, GAIN_VAR);

#ifdef BASOP_NOGLOB

            L_tmp = L_add_sat( L_tmp, denv[i] );

            itmp[i] = L_add_sat(L_tmp, itmp[i]);

#else

            L_tmp = L_add( L_tmp, denv[i] );

            itmp[i] = L_add(L_tmp, itmp[i]);

#endif

            move32();/* Q6 */



            if (itmp[i] < 0)

lib_com/fft_fx_evs.c

+5 −1
Original line number Diff line number Diff line
@@ -2783,7 +2783,11 @@ void fft3_fx(const Word16 X[], Word16 Y[], const Word16 n) 
    /* special case: i = 0 */

    acc = L_mult(*RZ0++, 0x4000);

    acc = L_mac(acc, *RZ1++, 0x4000);

#ifdef BASOP_NOGLOB

    *RY++ = mac_r_sat( acc, *RZ2++, 0x4000 );

#else

    *RY++ = mac_r( acc, *RZ2++, 0x4000 );

#endif

    move16();



    /* first 3/12-- from 1 to (3*m/8)-1 */

lib_com/stat_noise_uv_mod_fx.c

+5 −2
Original line number Diff line number Diff line
@@ -290,8 +290,11 @@ void stat_noise_uv_mod_fx( 
            L_tmp = L_mult(Exc2_local[i], alpha);       /* Q_local + 16 */

            L_tmp = L_mac(L_tmp, randval, alpha_m1);    /* Q_local + 16 */

            L_tmp3 = Mult_32_16(L_tmp, Noimix_fract);   /* Q_local+16+15-15 */

#ifdef BASOP_NOGLOB

            L_tmp = L_add_sat( L_tmp3, L_shl_sat( Mult_32_16( L_tmp, tmp_res ), 1 ) ); /* Q_local+16+14-15+1 */

#else

            L_tmp = L_add( L_tmp3, L_shl( Mult_32_16( L_tmp, tmp_res ), 1 ) ); /* Q_local+16+14-15+1 */



#endif

            Exc2_local[i] = extract_h(L_tmp);           /*Q_local */

        }

        *Q_stat_noise = Q_local;         /* update for next call, routine can only be called once every frame */

lib_com/swb_bwe_com_fx.c

+20 −5
Original line number Diff line number Diff line
@@ -722,8 +722,11 @@ Word32 calc_tilt_bwe_fx( /* o : Tilt in Q24 */ 
	exp2 = add(exp2, exp_sp);



	/* Put in Q24 */

#ifdef BASOP_NOGLOB

        L_temp = L_shr_sat( L_temp, sub( exp2, 24 ) );

#else

        L_temp = L_shr( L_temp, sub( exp2, 24 ) );



#endif

	BASOP_SATURATE_WARNING_ON_EVS



		return L_temp;
@@ -2025,7 +2028,11 @@ void SWB_BWE_decoding_fx( 
				FOR(; n_freq < tmp2; n_freq++)

				{

					L_tmp1 = Mult_32_16(SWB_signal_32[n_freq], factor);

#ifdef BASOP_NOGLOB

                    SWB_signal_32[n_freq] = L_shl_sat( L_tmp1, tmp - 1 );

#else

                    SWB_signal_32[n_freq] = L_shl( L_tmp1, tmp - 1 );

#endif

					move32(); /*15+Qsyn */

#ifdef BASOP_NOGLOB

                    factor = add_sat( factor, factor1 ); /*Q1 */
@@ -2044,7 +2051,11 @@ void SWB_BWE_decoding_fx( 
			FOR(; n_freq < tmp2; n_freq++)

			{

				L_tmp1 = Mult_32_16(SWB_signal_32[n_freq], factor);

#ifdef BASOP_NOGLOB

                SWB_signal_32[n_freq] = L_shl_sat( L_tmp1, 13 );

#else

                SWB_signal_32[n_freq] = L_shl( L_tmp1, 13 );

#endif

				move32();/*15+Qsyn */

				factor = add(factor,factor1); /*Q1 */

			}
@@ -2058,7 +2069,11 @@ void SWB_BWE_decoding_fx( 
				FOR(; n_freq < tmp2; n_freq++)

				{

					L_tmp1 = Mult_32_16(SWB_signal_32[n_freq], factor);

#ifdef BASOP_NOGLOB

                    SWB_signal_32[n_freq] = L_shl_sat( L_tmp1, 13 );

#else

                    SWB_signal_32[n_freq] = L_shl( L_tmp1, 13 );

#endif

					move32(); /*15+Qsyn */

				}

			}

lib_com/swb_tbe_com_fx.c

+16 −3
Original line number Diff line number Diff line
@@ -3826,8 +3826,13 @@ void elliptic_bpf_48k_generic_fx( 


    FOR( j=0; j<4; j++ )

    {

#ifdef BASOP_NOGLOB

        memory2_fx_2[j] = L_shl_sat( memory_fx2[2][j], sub( add( add( *Q_input_fx, 6 ), Q_temp ), memory_fx_Q[2] ) );

        memory2_fx_3[j] =L_shl_sat(memory_fx2[3][j],sub(add(add(*Q_input_fx,1) ,Q_temp) ,memory_fx_Q[3]));

#else

        memory2_fx_2[j] = L_shl( memory_fx2[2][j], sub( add( add( *Q_input_fx, 6 ), Q_temp ), memory_fx_Q[2] ) );

        memory2_fx_3[j] =L_shl(memory_fx2[3][j],sub(add(add(*Q_input_fx,1) ,Q_temp) ,memory_fx_Q[3]));

#endif

    }

    L_tmpX = L_shr(Mult_32_16(memory2_fx_2[0],full_band_bpf_fx[2][4]),3);/* *Q_input_fx+6 +Q_temp +13 -15 -3 */

    L_tmpX = L_add(L_shr(Mult_32_16(memory2_fx_2[1],full_band_bpf_fx[2][3]),3),L_tmpX);/*Q_input_fx + 6 +Q_temp+13 -15 -3*/
@@ -4023,11 +4028,19 @@ void synthesise_fb_high_band_fx( 
        L_tmp = Mult_32_16(ratio2,tmp[i]);/* Q(16-exp+exp_tmp-15 = 1-exp+exp_tmp) */

        IF( L_tmp < 0 )

        {

#ifdef BASOP_NOGLOB

            output[i] = negate( extract_h( L_shl_sat( L_negate( L_tmp ), tmp3 ) ) ); /*Qout*/

#else

            output[i] = negate( extract_h( L_shl( L_negate( L_tmp ), tmp3 ) ) ); /*Qout*/

#endif

        }

        ELSE

        {

#ifdef BASOP_NOGLOB

            output[i] = extract_h( L_shl_sat( L_tmp, tmp3 ) ); /*Qout*/

#else

            output[i] = extract_h( L_shl( L_tmp, tmp3 ) ); /*Qout*/

#endif

        }

    }

    return;