diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-26 17:06:27 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-26 17:06:27 -0800 |
| commit | f69ca4c61480acd4248aa4975ef205e1a96eaa3f (patch) | |
| tree | 71ab36d4737360d50015d51b6765a8cd74ed5aec /libAACdec/src/usacdec_lpd.cpp | |
| parent | 232d00017306ad6a8a3fe43487cf61c3e24e0e9b (diff) | |
| parent | b471c2c21574ab30b49c4ebf85699a951779700f (diff) | |
| download | fdk-aac-f69ca4c61480acd4248aa4975ef205e1a96eaa3f.tar.gz fdk-aac-f69ca4c61480acd4248aa4975ef205e1a96eaa3f.tar.bz2 fdk-aac-f69ca4c61480acd4248aa4975ef205e1a96eaa3f.zip | |
Merge "Signed Integer Overflow in E_UTIL_preemph()" am: aea2558c50
am: b471c2c215
Change-Id: Ib6f14a5f7b33ffb8bce1a9b37531c0872eeceb2e
Diffstat (limited to 'libAACdec/src/usacdec_lpd.cpp')
| -rw-r--r-- | libAACdec/src/usacdec_lpd.cpp | 1 |
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) */ |