vaapi plumbing to allow hardware video overlays

content/common/gpu/media/vaapi_drm_picture.cc

Index: content/common/gpu/media/vaapi_drm_picture.cc
diff --git a/content/common/gpu/media/vaapi_drm_picture.cc b/content/common/gpu/media/vaapi_drm_picture.cc
index 82e16ece31ad9a927aa289b6f8647d8574b3d7c1..4f01098c3363ac56945fe97a69b9c0e6e1f4c906 100644
--- a/content/common/gpu/media/vaapi_drm_picture.cc
+++ b/content/common/gpu/media/vaapi_drm_picture.cc
@@ -13,6 +13,7 @@
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_image_linux_dma_buffer.h"
 #include "ui/gl/scoped_binders.h"
+#include "ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h"
 #include "ui/ozone/public/native_pixmap.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
@@ -25,7 +26,7 @@ VaapiDrmPicture::VaapiDrmPicture(
     int32 picture_buffer_id,
     uint32 texture_id,
     const gfx::Size& size)
-    : VaapiPicture(picture_buffer_id, texture_id, size),
+    : VaapiPicture(picture_buffer_id, texture_id, size, true),
       vaapi_wrapper_(vaapi_wrapper),
       make_context_current_(make_context_current) {
 }
@@ -101,17 +102,14 @@ bool VaapiDrmPicture::Initialize() {
   if (!make_context_current_.Run())
     return false;
 
-  // Create an EGLImage out of the same buffer.
-  gl_image_ = new gfx::GLImageLinuxDMABuffer(size(), GL_RGBA);
-  if (!gl_image_->Initialize(base::FileDescriptor(dmabuf_fd, false),
-                             gfx::GpuMemoryBuffer::BGRA_8888, dmabuf_pitch)) {
-    LOG(ERROR) << "Failed to create a GLImageLinuxDMABuffer for a NativePixmap";
-    return false;
-  }
-
-  // Bind the EGLImage to the given GL texture.
   gfx::ScopedTextureBinder texture_binder(GL_TEXTURE_EXTERNAL_OES,
                                           texture_id());
+  gl_image_ = ui::GpuMemoryBufferFactoryOzoneNativeBuffer::CreateImageForPixmap(
+      pixmap_, size(), gfx::GpuMemoryBuffer::RGBA_8888, GL_RGBA);
+  if (!gl_image_) {
+    LOG(ERROR) << "Failed to create GLImage";
+    return false;
+  }
   if (!gl_image_->BindTexImage(GL_TEXTURE_EXTERNAL_OES)) {
     LOG(ERROR) << "Failed to bind texture to GLImage";
     return false;
@@ -126,4 +124,8 @@ bool VaapiDrmPicture::DownloadFromSurface(
                                      va_surface_->id(), va_surface_->size());
 }
 
+scoped_refptr<gfx::GLImage> VaapiDrmPicture::GetImageToBind() {
+  return gl_image_;
+}
+
 }  // namespace