diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-07 02:12:32 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-07 02:12:32 +0000 |
| commit | 9a6258f62fa59b20bf0492b4df5d6d9a88ab4f20 (patch) | |
| tree | 16d989b11e29eb0ee847d32be7fc439ee63fa435 | |
| parent | bc770efb33b9e64e9701ee184d99c75ac2ff0721 (diff) | |
| parent | 01e3419fd7b9e56afc6251e7cc452a1b7cf2e1b5 (diff) | |
| download | libopus-9a6258f62fa59b20bf0492b4df5d6d9a88ab4f20.tar.gz | |
Snap for 7066627 from 01e3419fd7b9e56afc6251e7cc452a1b7cf2e1b5 to sc-release
Change-Id: I9a1c2f9a048aaa79a329f02139d3020469ced8d1
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | METADATA | 8 | ||||
| -rw-r--r-- | celt/fixed_generic.h | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70c243b5..01b033fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +include: + - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml' + default: tags: - docker @@ -6,8 +9,6 @@ default: whitespace: stage: test - only: - - merge_requests script: - git diff-tree --check origin/master HEAD @@ -5,11 +5,11 @@ third_party { type: GIT value: "https://gitlab.xiph.org/xiph/opus.git" } - version: "d2f6805c3f36718a742c33c56eb945c2e10646ef" + version: "794392ecd77e6fc6aafa62c3f6002780abcc2c7c" license_type: NOTICE last_upgrade_date { - year: 2020 - month: 11 - day: 30 + year: 2021 + month: 1 + day: 5 } } diff --git a/celt/fixed_generic.h b/celt/fixed_generic.h index 5f4abda7..0ecbb899 100644 --- a/celt/fixed_generic.h +++ b/celt/fixed_generic.h @@ -102,9 +102,9 @@ #define SATURATE16(x) (EXTRACT16((x)>32767 ? 32767 : (x)<-32768 ? -32768 : (x))) -/** Shift by a and round-to-neareast 32-bit value. Result is a 16-bit value */ +/** Shift by a and round-to-nearest 32-bit value. Result is a 16-bit value */ #define ROUND16(x,a) (EXTRACT16(PSHR32((x),(a)))) -/** Shift by a and round-to-neareast 32-bit value. Result is a saturated 16-bit value */ +/** Shift by a and round-to-nearest 32-bit value. Result is a saturated 16-bit value */ #define SROUND16(x,a) EXTRACT16(SATURATE(PSHR32(x,a), 32767)); /** Divide by two */ |