1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-01-22 03:47:03 +01:00

Merge "Prevent energy overflow in acelp calc_period_factor()" am: eb9319afb2

am: 196f1ce484

Change-Id: I4bcc2e7ff145bffb7f11a090e8a048e9c2d11d76
This commit is contained in:
Fraunhofer IIS FDK 2018-12-29 06:16:43 -08:00 committed by android-build-merger
commit b29fd0db45

View File

@ -309,7 +309,7 @@ static FIXP_DBL calc_period_factor(FIXP_DBL exc[], FIXP_SGL gain_pit,
ener_exc = (FIXP_DBL)0; ener_exc = (FIXP_DBL)0;
for (int i = 0; i < L_SUBFR; i++) { for (int i = 0; i < L_SUBFR; i++) {
ener_exc += fPow2Div2(exc[i]) >> s; ener_exc += fPow2Div2(exc[i]) >> s;
if (ener_exc > FL2FXCONST_DBL(0.5f)) { if (ener_exc >= FL2FXCONST_DBL(0.5f)) {
ener_exc >>= 1; ener_exc >>= 1;
s++; s++;
} }