diff options
| author | Haibo Huang <hhb@google.com> | 2021-02-06 06:21:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-06 06:21:05 +0000 |
| commit | b9d1c0936f7e48702c9e30e9eb14564e997db4c2 (patch) | |
| tree | 3ef5570a35a45d16997c303379dd9d2cc20204f4 | |
| parent | eaa82ea7c03f68947c338838404672eff68b972b (diff) | |
| parent | 0358866c32459886e7157ecb60c51479442a5f10 (diff) | |
| download | libopus-b9d1c0936f7e48702c9e30e9eb14564e997db4c2.tar.gz | |
Upgrade libopus to d633f523e36e3b6d01cc6d57386458d770d618be am: fe30a3c3a7 am: e63131dcef am: 0358866c32
Original change: https://android-review.googlesource.com/c/platform/external/libopus/+/1577285
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1f042ff5a4851afdbfe43c955f239216e340200b
| -rw-r--r-- | METADATA | 4 | ||||
| -rw-r--r-- | celt/mathops.h | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -5,11 +5,11 @@ third_party { type: GIT value: "https://gitlab.xiph.org/xiph/opus.git" } - version: "794392ecd77e6fc6aafa62c3f6002780abcc2c7c" + version: "d633f523e36e3b6d01cc6d57386458d770d618be" license_type: NOTICE last_upgrade_date { year: 2021 - month: 1 + month: 2 day: 5 } } diff --git a/celt/mathops.h b/celt/mathops.h index 5e86ff0d..fe29dac1 100644 --- a/celt/mathops.h +++ b/celt/mathops.h @@ -137,7 +137,7 @@ static OPUS_INLINE float celt_log2(float x) } in; in.f = x; integer = (in.i>>23)-127; - in.i -= integer<<23; + in.i -= (opus_uint32)integer<<23; frac = in.f - 1.5f; frac = -0.41445418f + frac*(0.95909232f + frac*(-0.33951290f + frac*0.16541097f)); @@ -160,7 +160,7 @@ static OPUS_INLINE float celt_exp2(float x) /* K0 = 1, K1 = log(2), K2 = 3-4*log(2), K3 = 3*log(2) - 2 */ res.f = 0.99992522f + frac * (0.69583354f + frac * (0.22606716f + 0.078024523f*frac)); - res.i = (res.i + (integer<<23)) & 0x7fffffff; + res.i = (res.i + ((opus_uint32)integer<<23)) & 0x7fffffff; return res.f; } |