aboutsummaryrefslogtreecommitdiffstats
path: root/libAACdec/src/usacdec_lpd.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2018-12-26 17:02:23 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-26 17:02:23 -0800
commitb471c2c21574ab30b49c4ebf85699a951779700f (patch)
tree0c051d91f71c79c4f817482ff58587e0ec911f97 /libAACdec/src/usacdec_lpd.cpp
parent86d12efb927c91a4b8f6f995a023fb05958ae3e9 (diff)
parentaea2558c50377deed467bbaa5d259b4a0a29d409 (diff)
downloadfdk-aac-b471c2c21574ab30b49c4ebf85699a951779700f.tar.gz
fdk-aac-b471c2c21574ab30b49c4ebf85699a951779700f.tar.bz2
fdk-aac-b471c2c21574ab30b49c4ebf85699a951779700f.zip
Merge "Signed Integer Overflow in E_UTIL_preemph()"
am: aea2558c50 Change-Id: Ic9581dc891f10677dc7be6d4050d24cf57ca4541
Diffstat (limited to 'libAACdec/src/usacdec_lpd.cpp')
-rw-r--r--libAACdec/src/usacdec_lpd.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libAACdec/src/usacdec_lpd.cpp b/libAACdec/src/usacdec_lpd.cpp
index fde34ef..2110172 100644
--- a/libAACdec/src/usacdec_lpd.cpp
+++ b/libAACdec/src/usacdec_lpd.cpp
@@ -418,6 +418,7 @@ void CLpd_AdaptLowFreqDeemph(FIXP_DBL x[], int lg, FIXP_DBL alfd_gains[],
FIXP_DBL tmp_pow2[32];
s = s * 2 + ALFDPOW2_SCALE;
+ s = fMin(31, s);
k = 8;
i_max = lg / 4; /* ALFD range = 1600Hz (lg = 6400Hz) */