From 3442c30a382099fbd970c152b2ed9fc94f59dde2 Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Mon, 16 Nov 2020 20:24:09 +0000
Subject: [PATCH] Bug 1674832 - Use the AAudio backend by default.
 r=cubeb-reviewers,kinetik

Differential Revision: https://phabricator.services.mozilla.com/D95551
---
 media/libcubeb/aaudio_by_default.patch | 31 ++++++++++++++++++++++++++
 media/libcubeb/src/cubeb.c             |  3 +++
 media/libcubeb/update.sh               |  2 ++
 3 files changed, 36 insertions(+)
 create mode 100644 media/libcubeb/aaudio_by_default.patch

diff --git a/media/libcubeb/aaudio_by_default.patch b/media/libcubeb/aaudio_by_default.patch
new file mode 100644
index 000000000000..b1593268ad54
--- /dev/null
+++ b/media/libcubeb/aaudio_by_default.patch
@@ -0,0 +1,31 @@
+diff --git a/media/libcubeb/src/cubeb.c b/media/libcubeb/src/cubeb.c
+--- a/media/libcubeb/src/cubeb.c
++++ b/media/libcubeb/src/cubeb.c
+@@ -227,24 +227,22 @@ cubeb_init(cubeb ** context, char const 
+     wasapi_init,
+ #endif
+ #if defined(USE_WINMM)
+     winmm_init,
+ #endif
+ #if defined(USE_SUN)
+     sun_init,
+ #endif
++#if defined(USE_AAUDIO)
++    aaudio_init,
++#endif
+ #if defined(USE_OPENSL)
+     opensl_init,
+ #endif
+-    // TODO: should probably be preferred over OpenSLES when available.
+-    // Initialization will fail on old android devices.
+-#if defined(USE_AAUDIO)
+-    aaudio_init,
+-#endif
+ #if defined(USE_AUDIOTRACK)
+     audiotrack_init,
+ #endif
+ #if defined(USE_KAI)
+     kai_init,
+ #endif
+   };
+   int i;
diff --git a/media/libcubeb/src/cubeb.c b/media/libcubeb/src/cubeb.c
index 87574407f2e6..b47a3f7bd1fd 100644
--- a/media/libcubeb/src/cubeb.c
+++ b/media/libcubeb/src/cubeb.c
@@ -232,6 +232,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
 #if defined(USE_SUN)
     sun_init,
 #endif
+#if defined(USE_AAUDIO)
+    aaudio_init,
+#endif
 #if defined(USE_OPENSL)
     opensl_init,
 #endif
diff --git a/media/libcubeb/update.sh b/media/libcubeb/update.sh
index db775c9d1551..cd5adfc99247 100755
--- a/media/libcubeb/update.sh
+++ b/media/libcubeb/update.sh
@@ -86,3 +86,5 @@ if [ -n "$rev" ]; then
 else
   echo "Remember to update moz.yaml with the version details."
 fi
+
+patch -p3 < ./aaudio_by_default.patch