commit 9fe53c542e758145dd34e9e037368fcfad3fd3ba Author: Julien Cristau jcristau@mozilla.com Date: Wed Jan 27 19:22:22 2021 +0100

Backed out 1 changesets (bug 1674832) for causing frame drops on android (bug 1688783). a=backout

Backed out changeset 969761f1aa55 (bug 1674832) --- media/libcubeb/aaudio_by_default.patch | 31 ------------------------------- media/libcubeb/src/cubeb.c | 3 --- media/libcubeb/update.sh | 2 -- 3 files changed, 36 deletions(-)

diff --git a/media/libcubeb/aaudio_by_default.patch b/media/libcubeb/aaudio_by_default.patch deleted file mode 100644 index b1593268ad54..000000000000 --- a/media/libcubeb/aaudio_by_default.patch +++ /dev/null @@ -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; diff --git a/media/libcubeb/src/cubeb.c b/media/libcubeb/src/cubeb.c index 538e1d06d4a3..25389d1fa42a 100644 --- a/media/libcubeb/src/cubeb.c +++ b/media/libcubeb/src/cubeb.c @@ -232,9 +232,6 @@ 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 cd5adfc99247..db775c9d1551 100755 --- a/media/libcubeb/update.sh +++ b/media/libcubeb/update.sh @@ -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