diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-07 00:03:21 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-07 00:03:21 +0000 |
commit | 7942130995a7c3944b461b1cc028ed96c743ed60 (patch) | |
tree | 3ef5570a35a45d16997c303379dd9d2cc20204f4 | |
parent | c1fb1a0b8e3e615d019cc54b2eb861c9ef1b4abf (diff) | |
parent | b9d1c0936f7e48702c9e30e9eb14564e997db4c2 (diff) | |
download | libopus-7942130995a7c3944b461b1cc028ed96c743ed60.tar.gz |
Snap for 7129394 from b9d1c0936f7e48702c9e30e9eb14564e997db4c2 to sc-d1-release
Change-Id: I7869015068390b92b539b91addcd486deaa8a8b9
-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; } |