From 949294537b74b85fce413e65d266d72a592f6076 Mon Sep 17 00:00:00 2001
From: Eugen Sawin <esawin@me73.com>
Date: Mon, 28 Sep 2015 16:37:45 +0200
Subject: [PATCH] Bug 1190379 - Disable surface copying on emulators. r=snorp

---
 dom/media/platforms/android/AndroidDecoderModule.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dom/media/platforms/android/AndroidDecoderModule.cpp b/dom/media/platforms/android/AndroidDecoderModule.cpp
index b2dc3019a3fb..fc9cc6c4da0a 100644
--- a/dom/media/platforms/android/AndroidDecoderModule.cpp
+++ b/dom/media/platforms/android/AndroidDecoderModule.cpp
@@ -86,8 +86,10 @@ public:
   }
 
   bool WantCopy() {
-    // Allocating a texture is incredibly slow on PowerVR
-    return mGLContext->Vendor() != GLVendor::Imagination;
+    // Allocating a texture is incredibly slow on PowerVR and may fail on
+    // emulators, see bug 1190379.
+    return mGLContext->Vendor() != GLVendor::Imagination &&
+           mGLContext->Renderer() != GLRenderer::AndroidEmulator;
   }
 
   EGLImage CopySurface(layers::Image* img) {