Upgrade libopus to 8cf872a186b96085b1bb3a547afd598354ebeb87 am: 317f504f2c

Original change: https://android-review.googlesource.com/c/platform/external/libopus/+/2393535

Change-Id: Ia94a6c571eb2671d99b063b66654efed33587142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 20 insertions, 6 deletions

diff --git a/METADATA b/METADATA
index 2733a74f..616c521c 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,7 @@
+# This project was upgraded with external_updater.
+# Usage: tools/external_updater/updater.sh update libopus
+# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md
+
 name: "libopus"
 description: "Android fork of the opus library."
 third_party {
@@ -5,14 +9,14 @@ third_party {
     type: GIT
     value: "https://gitlab.xiph.org/xiph/opus.git"
   }
-  version: "bce1f392353d72d77d543bb2069a044ae1045e9d"
+  version: "8cf872a186b96085b1bb3a547afd598354ebeb87"
   license_type: NOTICE
   security {
     tag: "NVD-CPE2.3:cpe:/a:opus-codec:opus:1.0.3"
   }
   last_upgrade_date {
-    year: 2022
-    month: 10
-    day: 10
+    year: 2023
+    month: 1
+    day: 18
   }
 }
diff --git a/celt/kiss_fft.h b/celt/kiss_fft.h
index bffa2bfa..267f72f9 100644
--- a/celt/kiss_fft.h
+++ b/celt/kiss_fft.h
@@ -52,6 +52,10 @@ extern "C" {
 #  define kiss_fft_scalar opus_int32
 #  define kiss_twiddle_scalar opus_int16
 
+/* Some 32-bit CPUs would load/store a kiss_twiddle_cpx with a single memory
+ * access, and could benefit from additional alignment.
+ */
+#  define KISS_TWIDDLE_CPX_ALIGNMENT (sizeof(opus_int32))
 
 #else
 # ifndef kiss_fft_scalar
@@ -62,6 +66,12 @@ extern "C" {
 # endif
 #endif
 
+#if defined(__GNUC__) && defined(KISS_TWIDDLE_CPX_ALIGNMENT)
+#define KISS_TWIDDLE_CPX_ALIGNED __attribute__((aligned(KISS_TWIDDLE_CPX_ALIGNMENT)))
+#else
+#define KISS_TWIDDLE_CPX_ALIGNED
+#endif
+
 typedef struct {
     kiss_fft_scalar r;
     kiss_fft_scalar i;
@@ -70,7 +80,7 @@ typedef struct {
 typedef struct {
    kiss_twiddle_scalar r;
    kiss_twiddle_scalar i;
-}kiss_twiddle_cpx;
+} KISS_TWIDDLE_CPX_ALIGNED kiss_twiddle_cpx;
 
 #define MAXFACTORS 8
 /* e.g. an fft of length 128 has 4 factors
diff --git a/opus.m4 b/opus.m4
index 47f5ec49..263470d4 100644
--- a/opus.m4
+++ b/opus.m4
@@ -63,7 +63,7 @@ dnl
 #include <string.h>
 #include <opus.h>
 
-int main ()
+int main (void)
 {
   system("touch conf.opustest");
   return 0;