Bug 1688783 - Don't use AAudio by default for now. r=kinetik

Differential Revision: https://phabricator.services.mozilla.com/D105287
This commit is contained in:
Paul Adenot 2021-02-17 13:22:12 +00:00
parent ae40623709
commit e2bf2085fe
3 changed files with 5 additions and 36 deletions

View File

@ -1,31 +0,0 @@
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;

View File

@ -232,11 +232,13 @@ 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
// 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,

View File

@ -86,5 +86,3 @@ if [ -n "$rev" ]; then
else
echo "Remember to update moz.yaml with the version details."
fi
patch -p3 < ./aaudio_by_default.patch