Video decode in hardware on ARM platform.

content/common/gpu/media/gles2_texture_to_egl_image_translator.cc

Index: content/common/gpu/media/gles2_texture_to_egl_image_translator.cc
===================================================================
--- content/common/gpu/media/gles2_texture_to_egl_image_translator.cc	(revision 120554)
+++ content/common/gpu/media/gles2_texture_to_egl_image_translator.cc	(working copy)
@@ -13,12 +13,17 @@
 static PFNEGLDESTROYIMAGEKHRPROC egl_destroy_image_khr =
     reinterpret_cast<PFNEGLDESTROYIMAGEKHRPROC>(
         eglGetProcAddress("eglDestroyImageKHR"));
+static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glegl_image_targettexture_2does =
+    reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(
+        eglGetProcAddress("glEGLImageTargetTexture2DOES"));
 
 static bool AreEGLExtensionsInitialized() {
   return (egl_create_image_khr && egl_destroy_image_khr);
 }
 
-Gles2TextureToEglImageTranslator::Gles2TextureToEglImageTranslator() {
+Gles2TextureToEglImageTranslator::Gles2TextureToEglImageTranslator(
+    Display* x_display)
+    : x_display_(x_display) {
   if (!AreEGLExtensionsInitialized()) {
     LOG(DFATAL) << "Failed to get EGL extensions";
     return;
@@ -31,19 +36,47 @@
 }
 
 EGLImageKHR Gles2TextureToEglImageTranslator::TranslateToEglImage(
-    EGLDisplay egl_display, EGLContext egl_context, uint32 texture) {
-  EGLint attrib = EGL_NONE;
+    EGLDisplay egl_display, EGLContext egl_context,
+    uint32 texture,
+    int width, int height) {
   if (!egl_create_image_khr)
     return EGL_NO_IMAGE_KHR;
-  // Create an EGLImage
-  EGLImageKHR hEglImage = egl_create_image_khr(
-      egl_display,
-      egl_context,
-      EGL_GL_TEXTURE_2D_KHR,
-      reinterpret_cast<EGLClientBuffer>(texture),
-      &attrib);
-  CHECK(hEglImage) << "Failed to eglCreateImageKHR for " << texture
-                   << ", error: 0x" << std::hex << eglGetError();
+  EGLImageKHR hEglImage;
+  if (x_display_) {

[Ami GONE FROM CHROMIUM, 2012/02/18 00:00:25]

This seems like a strange way to indicate which codepath to go down.
Why not pass an explicit bool use_backing_pixmaps parameter to the ctor instead
of x_display?
Also, there's no reason OVDA should call gfx::GLSurfaceEGL::GetNativeDisplay()
just to pass it to here, when this class could just as well call the same
function.

+    if (!glegl_image_targettexture_2does)
+      return EGL_NO_IMAGE_KHR;
+
+    EGLint image_attrs[] = { EGL_IMAGE_PRESERVED_KHR, 1 , EGL_NONE };
+
+    glActiveTexture(GL_TEXTURE0);
+    glBindTexture(GL_TEXTURE_2D, texture);
+
+    Pixmap pixmap = XCreatePixmap(x_display_, RootWindow(x_display_, 0),
+                                                     width, height, 32);
+
+    hEglImage = egl_create_image_khr(egl_display,
+                                     EGL_NO_CONTEXT,
+                                     EGL_NATIVE_PIXMAP_KHR,
+                                     (EGLClientBuffer)pixmap,
+                                     image_attrs);
+    CHECK(hEglImage) << "Failed to eglCreateImageKHR for " << texture
+                                 << ", error: 0x" << std::hex << eglGetError();
+
+    glegl_image_targettexture_2does(GL_TEXTURE_2D, hEglImage);
+    eglimage_pixmap_.insert(std::make_pair(hEglImage, pixmap));

[Ami GONE FROM CHROMIUM, 2012/02/18 00:00:25]

If you expect no collisions, the standard idiom is to say so with:

bool inserted = the_map.insert(std::make_pair(k, v)).second;
DCHECK(inserted);

+
+  } else {
+    EGLint attrib = EGL_NONE;
+    // Create an EGLImage
+    hEglImage = egl_create_image_khr(egl_display,
+                                     egl_context,
+                                     EGL_GL_TEXTURE_2D_KHR,
+                                     reinterpret_cast<EGLClientBuffer>(texture),
+                                     &attrib);
+    CHECK(hEglImage) << "Failed to eglCreateImageKHR for " << texture

[Ami GONE FROM CHROMIUM, 2012/02/18 00:00:25]

This CHECK  and the one at l.62 can be coallesced into a single CHECK outside
the if/then/else below.

+                                 << ", error: 0x" << std::hex << eglGetError();
+
+  }
   return hEglImage;
 }
 
@@ -65,4 +98,12 @@
     return;
   }
   egl_destroy_image_khr(egl_display, egl_image);
+
+  if (x_display_) {
+    ImagePixmap::iterator it = eglimage_pixmap_.find(egl_image);
+    CHECK(it != eglimage_pixmap_.end());
+    Pixmap pixmap = it->second;

[Ami GONE FROM CHROMIUM, 2012/02/18 00:00:25]

Also
eglimage_pixmap_.erase(it);
?

+    if (pixmap)

[Ami GONE FROM CHROMIUM, 2012/02/18 00:00:25]

When will this test be false?

+      XFreePixmap(x_display_, pixmap);
+  }
 }