Commit baef6ba4 authored by vaillancour's avatar vaillancour
Browse files

Correction on compl saturations for 26.444

parent 07cad1dd

lib_com/swb_bwe_com_lr_fx.c

+5 −1
Original line number Diff line number Diff line
@@ -2383,7 +2383,11 @@ void ton_ene_est_fx( 
			L_E = sum2_fx(&xSynth_har_fx[sub(band_start[i], fLenLow)], band_width[i]);

			QE = add(shl(QxSynth_sft, 1), 1);



#ifdef BASOP_NOGLOB

            L_E = L_shl_sat( L_E, sub( *QbeL, QE ) );

#else

            L_E = L_shl( L_E, sub( *QbeL, QE ) );

#endif 

			QE = *QbeL;

		}

		ELSE

lib_com/swb_tbe_com_fx.c

+5 −1
Original line number Diff line number Diff line
@@ -4103,7 +4103,11 @@ void Estimate_mix_factors_fx( 
        /* (Q_bwe_exc) */



        /* temp_numer2[i] = sub(exc16kWhtnd[i], WN_exc_local[i]); */

#ifdef BASOP_NOGLOB

        temp_numer2[i] = sub_sat( exc16kWhtnd[i], round_fx_sat( L_shl_sat( L_tmp1, sc1 ) ) );

#else

        temp_numer2[i] = sub( exc16kWhtnd[i], round_fx( L_shl( L_tmp1, sc1 ) ) );

#endif

        move16();

        /* (Q_bwe_exc) */

    }

lib_enc/nelp_enc_fx.c

+10 −2
Original line number Diff line number Diff line
@@ -699,7 +699,11 @@ void nelp_encoder_fx( 
		Ltemp1 = Mult_32_16(l_nelp_gain_mem, fdbck_fx);/*exp1+qGain-15 */

		L_tmp = L_add(L_tmp, Ltemp1);

		L_tmp = L_shr_r(L_tmp, (exp1 - 15));

#ifdef BASOP_NOGLOB

        Gains_fx[i] = round_fx_sat( L_shl_sat( L_tmp, 16 ) );

#else

        Gains_fx[i] = round_fx( L_shl( L_tmp, 16 ) );

#endif

		move16();

		l_nelp_gain_mem = L_tmp;

	}
@@ -879,7 +883,11 @@ void nelp_encoder_fx( 
		EH2_fx = L_deposit_l(0);

		FOR(i = 0; i < L_FRAME; i++)

		{

#ifdef BASOP_NOGLOB

                    EH2_fx = L_mac0_sat( EH2_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEH2) */

#else

                    EH2_fx = L_mac0( EH2_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEH2) */

#endif

		}

		qEH2 = 2 * qEH2;

		move16();