VaapiVideoAccelerator: make Vaapi accelerator work with ozone

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
new file mode 100644
index 0000000000000000000000000000000000000000..8f38721f3946eb1b7f58621748a00b00e4ff0508
--- /dev/null
+++ b/content/common/gpu/media/vaapi_drm_picture.cc
@@ -0,0 +1,131 @@
+// Copyright (c) 2014 The Chromium Authors. All rights reserved.

[Pawel Osciak, 2014/11/12 05:52:58]

No "(c)" in new files please. Please use
http://www.chromium.org/developers/coding-style#TOC-File-headers for the correct
header.

[llandwerlin-old, 2014/11/12 18:04:42]

Acknowledged.

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/file_descriptor_posix.h"
+#include "content/common/gpu/media/va_surface.h"
+#include "content/common/gpu/media/vaapi_drm_picture.h"
+#include "content/common/gpu/media/vaapi_wrapper.h"
+#include "third_party/libva/va/drm/va_drm.h"
+#include "third_party/libva/va/va_drmcommon.h"
+#include "ui/gfx/gpu_memory_buffer.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_image_linux_dma_buffer.h"
+#include "ui/gl/scoped_binders.h"
+#include "ui/ozone/public/native_pixmap.h"
+#include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/public/surface_factory_ozone.h"
+
+namespace content {
+
+VaapiDrmPicture::VaapiDrmPicture(
+    base::WeakPtr<VaapiWrapper> vaapi_wrapper,
+    const base::Callback<bool(void)> make_context_current,
+    int32 picture_buffer_id,
+    uint32 texture_id,
+    const gfx::Size& size)
+    : VaapiPicture(picture_buffer_id, texture_id, size),
+      vaapi_wrapper_(vaapi_wrapper),
+      make_context_current_(make_context_current) {
+}
+
+VaapiDrmPicture::~VaapiDrmPicture() {
+  // At this point |vaapi_wrapper_| shouldn't be available anymore.
+  DCHECK(!vaapi_wrapper_.get());
+
+  if (egl_image_.get() && make_context_current_.Run()) {
+    egl_image_->Destroy(true);
+
+    DCHECK_EQ(glGetError(), GL_NO_ERROR);
+  }
+}
+
+bool VaapiDrmPicture::Initialize() {
+  VASurfaceAttrib va_attribs[2];
+  VASurfaceAttribExternalBuffers va_attrib_extbuf;
+
+  ui::OzonePlatform* platform = ui::OzonePlatform::GetInstance();
+  ui::SurfaceFactoryOzone* factory = platform->GetSurfaceFactoryOzone();
+
+  pixmap_ =
+      factory->CreateNativePixmap(size(), ui::SurfaceFactoryOzone::RGBA_8888);
+  if (!pixmap_.get()) {
+    LOG(ERROR) << "Failed creating an Ozone NativePixmap";
+    return false;
+  }
+
+  int dmabuf_fd = pixmap_->GetDmaBufFd();
+  if (dmabuf_fd < 0) {
+    LOG(ERROR) << "Failed get dmabuf from an Ozone NativePixmap";
+    return false;
+  }
+  int dmabuf_pitch = pixmap_->GetDmaBufPitch();
+
+  va_attrib_extbuf.pixel_format = VA_FOURCC_BGRX;

[Pawel Osciak, 2014/11/12 05:52:58]

Perhaps memset it to 0 first and also drop 0-assignments?

[llandwerlin-old, 2014/11/12 18:04:42]

Acknowledged.

+  va_attrib_extbuf.width = size().width();
+  va_attrib_extbuf.height = size().height();
+  va_attrib_extbuf.data_size = size().height() * dmabuf_pitch;
+  va_attrib_extbuf.num_planes = 1;
+  va_attrib_extbuf.pitches[0] = dmabuf_pitch;
+  va_attrib_extbuf.offsets[0] = 0;
+  va_attrib_extbuf.buffers = reinterpret_cast<unsigned long*>(&dmabuf_fd);
+  va_attrib_extbuf.num_buffers = 1;
+  va_attrib_extbuf.flags = 0;
+  va_attrib_extbuf.private_data = NULL;
+
+  va_attribs[0].type = VASurfaceAttribMemoryType;
+  va_attribs[0].flags = VA_SURFACE_ATTRIB_SETTABLE;
+  va_attribs[0].value.type = VAGenericValueTypeInteger;
+  va_attribs[0].value.value.i = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME;
+
+  va_attribs[1].type = VASurfaceAttribExternalBufferDescriptor;
+  va_attribs[1].flags = VA_SURFACE_ATTRIB_SETTABLE;
+  va_attribs[1].value.type = VAGenericValueTypePointer;
+  va_attribs[1].value.value.p = &va_attrib_extbuf;
+
+  va_surface_ = vaapi_wrapper_->CreateUnownedSurface(

[Pawel Osciak, 2014/11/12 05:52:58]

You can't dereference a WeakPtr like this. It will return NULL if it's no longer
valid (please see explanation at
https://code.google.com/p/chromium/codesearch#chromium/src/base/memory/weak_p...).

[llandwerlin-old, 2014/11/12 18:04:42]

Acknowledged.

+      VA_RT_FORMAT_RGB32, size(), va_attribs, arraysize(va_attribs));
+  if (!va_surface_.get()) {
+    LOG(ERROR) << "Failed to create VASurface for an Ozone NativePixmap";
+    return false;
+  }
+
+  if (!make_context_current_.Run())
+    return false;
+
+  egl_image_ = new gfx::GLImageLinuxDMABuffer(size(), GL_RGBA);
+  if (!egl_image_->Initialize(base::FileDescriptor(dmabuf_fd, false),
+                              gfx::GpuMemoryBuffer::BGRA_8888,
+                              dmabuf_pitch)) {
+    LOG(ERROR) << "Failed to create an EGLImage for an Ozone NativePixmap";
+    return false;
+  }

[Pawel Osciak, 2014/11/12 05:52:58]

Do we need to make context current somewhere around here?

[llandwerlin-old, 2014/11/12 18:04:42]

It's done line 93.

[Pawel Osciak, 2014/12/08 10:55:15]

Right, somehow missed that, sorry.

+
+  gfx::ScopedTextureBinder texture_binder(GL_TEXTURE_EXTERNAL_OES,
+                                          texture_id());
+  if (!egl_image_->BindTexImage(GL_TEXTURE_EXTERNAL_OES)) {

[Pawel Osciak, 2014/11/12 05:52:58]

Do we need to ReleaseTexImage() somewhere?

[llandwerlin-old, 2014/11/12 18:04:42]

I guess I can do this in the destructor of the VaapiDrmPicture, though it's a
noop for GLImageEGL (and subclasses).

[Pawel Osciak, 2014/12/08 10:55:15]

Yes, but we should still do this. Thanks for adding.

+    LOG(ERROR) << "Failed to bind texture to EGLImage";
+    return false;
+  }
+
+  return true;
+}
+
+bool VaapiDrmPicture::DownloadFromSurface(
+    const scoped_refptr<VASurface>& va_surface) {
+  return vaapi_wrapper_->BlitSurface(va_surface->id(),
+                                     va_surface->size(),
+                                     va_surface_->id(),
+                                     va_surface_->size());
+}
+
+void VaapiDrmPicture::DisposeVaapi() {
+  va_surface_ = NULL;
+}
+
+// static
+uint32 VaapiPicture::GetGLTextureTarget() {

[Pawel Osciak, 2014/11/12 05:52:58]

I feel this is not a good way to do this. Please make it non-static and
implement in VaapiDrmPicture and TFP.

[llandwerlin-old, 2014/11/12 18:04:42]

We need to know the texture target for the user prior creation of the pictures.
Should I move this into the VDA?

+  return GL_TEXTURE_EXTERNAL_OES;
+}
+
+}  // namespace