VaapiVideoAccelerator: make Vaapi accelerator work with ozone

content/common/gpu/media/vaapi_picture_provider.cc

Index: content/common/gpu/media/vaapi_picture_provider.cc
diff --git a/content/common/gpu/media/vaapi_picture_provider.cc b/content/common/gpu/media/vaapi_picture_provider.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a06f89c0a765c64e8d9d86ad4f3cffa607db0641
--- /dev/null
+++ b/content/common/gpu/media/vaapi_picture_provider.cc
@@ -0,0 +1,590 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/common/gpu/media/vaapi_picture_provider.h"
+
+#include "base/bind.h"
+#include "base/callback.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_image.h"
+#if defined(USE_X11)
+#include "third_party/libva/va/va_x11.h"
+#include "ui/gl/gl_context_glx.h"
+#else
+#include <gbm.h>

[spang, 2014/09/05 20:45:46]

Remove gbm #include.

+#include "third_party/libva/va/drm/va_drm.h"
+#include "third_party/libva/va/va_drmcommon.h"
+#include "ui/gl/gl_image_egl.h"
+#include "ui/ozone/public/native_pixmap.h"
+#include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/public/surface_factory_ozone.h"
+#include <va/va_vpp.h>
+#endif  // USE_X11
+#include "ui/gl/scoped_binders.h"
+
+#define LOG_VA_ERROR_AND_RETURN(input, err_msg, output_code)    \
+  do {                                                          \
+    VAStatus va_status = input;                                 \
+    if (va_status != VA_STATUS_SUCCESS) {                       \
+      DVLOG(1) << err_msg << " : " << va_status;                \
+      output_code;                                              \
+      return false;                                             \
+    }                                                           \
+  } while (0)
+
+namespace content {
+
+namespace {
+
+#if defined(USE_X11)
+
+class TFPPicture;
+
+class X11VaapiPictureProvider : public VaapiPictureProvider {
+ public:
+  X11VaapiPictureProvider(
+      VADisplay va_display,
+      gfx::GLContextGLX* glx_context,
+      const base::Callback<bool(void)> make_context_current);
+  virtual ~X11VaapiPictureProvider();
+
+  virtual scoped_ptr<VaapiPictureProvider::Picture> CreatePicture(
+      int32 picture_buffer_id,
+      uint32 texture_id,
+      const gfx::Size& size) OVERRIDE;
+
+  void DestroyPicture(TFPPicture* tfp_picture);
+
+  virtual bool PutSurfaceIntoPicture(
+      VASurfaceID va_surface_id,
+      VaapiPictureProvider::Picture* picture) OVERRIDE;
+
+  virtual bool Initialize() OVERRIDE;
+
+ private:
+
+  bool BindPicture(TFPPicture* picture);
+
+  gfx::GLContextGLX* glx_context_;
+  base::Callback<bool(void)> make_context_current_;
+
+  Display* x_display_;
+  GLXFBConfig fb_config_;
+
+  VADisplay va_display_;
+};
+
+class TFPPicture : public VaapiPictureProvider::Picture {
+ public:
+  TFPPicture(X11VaapiPictureProvider* provider,
+             int32 picture_buffer_id,
+             uint32 texture_id,
+             const gfx::Size& size,
+             Pixmap x_pixmap,
+             GLXPixmap glx_pixmap)
+      : Picture(picture_buffer_id, texture_id, size),
+        provider_(provider),
+        x_pixmap_(x_pixmap),
+        glx_pixmap_(glx_pixmap) {}
+  virtual ~TFPPicture() { provider_->DestroyPicture(this); }
+
+  Pixmap x_pixmap() const { return x_pixmap_; }
+  GLXPixmap glx_pixmap() const { return glx_pixmap_; }
+
+ private:
+  X11VaapiPictureProvider* provider_;
+  Pixmap x_pixmap_;
+  GLXPixmap glx_pixmap_;
+};
+
+class XFreeDeleter {
+ public:
+  void operator()(void* x) const { ::XFree(x); }
+};
+
+X11VaapiPictureProvider::X11VaapiPictureProvider(
+    VADisplay va_display,
+    gfx::GLContextGLX* glx_context,
+    const base::Callback<bool(void)> make_context_current)
+    : glx_context_(glx_context),
+      make_context_current_(make_context_current),
+      x_display_(glx_context_->display()),
+      va_display_(va_display) {
+}
+
+X11VaapiPictureProvider::~X11VaapiPictureProvider() {
+}
+
+scoped_ptr<VaapiPictureProvider::Picture>
+X11VaapiPictureProvider::CreatePicture(int32 picture_buffer_id,
+                                       uint32 texture_id,
+                                       const gfx::Size& size) {
+  scoped_ptr<VaapiPictureProvider::Picture> picture;
+
+  if (!make_context_current_.Run())
+    return picture.Pass();
+
+  XWindowAttributes win_attr;
+  int screen = DefaultScreen(x_display_);
+  XGetWindowAttributes(x_display_, RootWindow(x_display_, screen), &win_attr);
+  // TODO(posciak): pass the depth required by libva, not the RootWindow's
+  // depth
+  Pixmap x_pixmap = XCreatePixmap(x_display_,
+                                  RootWindow(x_display_, screen),
+                                  size.width(),
+                                  size.height(),
+                                  win_attr.depth);
+  if (!x_pixmap) {
+    DVLOG(1) << "Failed creating an X Pixmap for TFP";
+    return picture.Pass();
+  }
+
+  static const int pixmap_attr[] = {
+    GLX_TEXTURE_TARGET_EXT,     GLX_TEXTURE_2D_EXT, GLX_TEXTURE_FORMAT_EXT,
+    GLX_TEXTURE_FORMAT_RGB_EXT, GL_NONE,
+  };
+
+  GLXPixmap glx_pixmap =
+    glXCreatePixmap(x_display_, fb_config_, x_pixmap, pixmap_attr);
+  if (!glx_pixmap) {
+    // x_pixmap_ will be freed in the destructor.
+    DVLOG(1) << "Failed creating a GLX Pixmap for TFP";
+    XFreePixmap(x_display_, x_pixmap);
+    return picture.Pass();
+  }
+
+  picture.reset(new TFPPicture(this,
+                               picture_buffer_id,
+                               texture_id,
+                               size,
+                               x_pixmap,
+                               glx_pixmap));
+
+  return picture.Pass();
+}
+
+void X11VaapiPictureProvider::DestroyPicture(TFPPicture* tfp_picture) {
+  // Unbind surface from texture and deallocate resources.
+  if (tfp_picture->glx_pixmap() && make_context_current_.Run()) {
+    glXReleaseTexImageEXT(x_display_,
+                          tfp_picture->glx_pixmap(),
+                          GLX_FRONT_LEFT_EXT);
+    glXDestroyPixmap(x_display_, tfp_picture->glx_pixmap());
+  }
+
+  if (tfp_picture->x_pixmap())
+    XFreePixmap(x_display_, tfp_picture->x_pixmap());
+  XSync(x_display_, False);  // Needed to work around buggy vdpau-driver.
+}
+
+bool X11VaapiPictureProvider::PutSurfaceIntoPicture(
+    VASurfaceID va_surface_id,
+    VaapiPictureProvider::Picture* picture) {
+  TFPPicture* tfp_picture = static_cast<TFPPicture*>(picture);
+  const gfx::Size& size = tfp_picture->size();
+
+  if (!BindPicture(tfp_picture))
+    return false;
+
+  LOG_VA_ERROR_AND_RETURN(vaPutSurface(va_display_,
+                                       va_surface_id,
+                                       tfp_picture->x_pixmap(),
+                                       0, 0,
+                                       size.width(),
+                                       size.height(),
+                                       0, 0,
+                                       size.width(),
+                                       size.height(),
+                                       NULL,
+                                       0, 0),
+                          "Couldn't put surface into picture",);
+  return true;
+}
+
+bool X11VaapiPictureProvider::Initialize(){
+  if (!make_context_current_.Run()) {
+    DVLOG(1) << "Couldn't make context current";
+    return false;
+  }
+
+  const int fbconfig_attr[] = {
+    GLX_DRAWABLE_TYPE,               GLX_PIXMAP_BIT,
+    GLX_BIND_TO_TEXTURE_TARGETS_EXT, GLX_TEXTURE_2D_BIT_EXT,
+    GLX_BIND_TO_TEXTURE_RGB_EXT,     GL_TRUE,
+    GLX_Y_INVERTED_EXT,              GL_TRUE,
+    GL_NONE,
+  };
+
+  int num_fbconfigs;
+  scoped_ptr<GLXFBConfig, XFreeDeleter> glx_fb_configs(glXChooseFBConfig(
+      x_display_, DefaultScreen(x_display_), fbconfig_attr, &num_fbconfigs));
+
+  if (!glx_fb_configs) {
+    DVLOG(1) << "Couldn't get glx configs";
+    return false;
+  }
+  if (!num_fbconfigs) {
+    DVLOG(1) << "Couldn't get at least a glx config";
+    return false;
+  }
+
+  fb_config_ = glx_fb_configs.get()[0];
+  return true;
+}
+
+bool X11VaapiPictureProvider::BindPicture(TFPPicture* tfp_picture) {
+  if (!make_context_current_.Run()) {
+    DVLOG(1) << "Failed making gl context current";
+    return false;
+  }
+
+  gfx::ScopedTextureBinder texture_binder(GL_TEXTURE_2D,
+                                          tfp_picture->texture_id());
+  glXBindTexImageEXT(x_display_, tfp_picture->glx_pixmap(),
+                     GLX_FRONT_LEFT_EXT, NULL);
+
+  return true;
+}
+
+#else
+
+class GbmPicture;
+
+class GbmVaapiPictureProvider : public VaapiPictureProvider {

[spang, 2014/09/05 20:45:46]

s/Gbm/Drm/

+ public:
+  GbmVaapiPictureProvider(
+      VADisplay va_display,
+      const base::Callback<bool(void)> make_context_current);
+  virtual ~GbmVaapiPictureProvider();
+
+  virtual scoped_ptr<VaapiPictureProvider::Picture> CreatePicture(
+      int32 picture_buffer_id,
+      uint32 texture_id,
+      const gfx::Size& size) OVERRIDE;
+
+  void DestroyPicture(GbmPicture* gbm_picture);
+
+  virtual bool PutSurfaceIntoPicture(
+      VASurfaceID va_surface_id,
+      VaapiPictureProvider::Picture* picture) OVERRIDE;
+
+  virtual bool SetCodedSurfacesSize(const gfx::Size& size) OVERRIDE;
+
+  virtual bool Initialize() OVERRIDE;
+
+ private:
+  bool InitializeVpp(const gfx::Size& size);
+
+  bool IsVppInitialized();
+
+  void DeinitializeVpp();
+
+  base::Callback<bool(void)> make_context_current_;
+
+  VADisplay va_display_;
+
+  VAConfigID vpp_config_;
+  VAContextID vpp_context_;
+  VABufferID vpp_buffer_;
+
+  gfx::Size coded_picture_size_;
+};
+
+class GbmPicture : public VaapiPictureProvider::Picture {

[spang, 2014/09/05 20:45:46]

s/Gbm/Drm/

+ public:
+  GbmPicture(GbmVaapiPictureProvider* provider,
+             int32 picture_buffer_id,
+             uint32 texture_id,
+             const gfx::Size& size,
+             VASurfaceID va_surface,
+             scoped_refptr<ui::NativePixmap> pixmap,
+             scoped_refptr<gfx::GLImage> gl_image)
+      : Picture(picture_buffer_id, texture_id, size),
+        provider_(provider),
+        va_surface_(va_surface),
+        pixmap_(pixmap),
+        gl_image_(gl_image) {}
+  virtual ~GbmPicture() {
+    provider_->DestroyPicture(this);
+  }
+
+  scoped_refptr<gfx::GLImage> gl_image() const { return gl_image_; }
+  VASurfaceID va_surface() const { return va_surface_; }
+
+ private:
+  GbmVaapiPictureProvider* provider_;
+  VASurfaceID va_surface_;
+  scoped_refptr<ui::NativePixmap> pixmap_;
+  scoped_refptr<gfx::GLImage> gl_image_;
+};
+
+GbmVaapiPictureProvider::GbmVaapiPictureProvider(
+    VADisplay va_display,
+    const base::Callback<bool(void)> make_context_current)
+    : make_context_current_(make_context_current),
+      va_display_(va_display),
+      vpp_config_(VA_INVALID_ID),
+      vpp_context_(VA_INVALID_ID),
+      vpp_buffer_(VA_INVALID_ID) {
+}
+
+GbmVaapiPictureProvider::~GbmVaapiPictureProvider() {
+  DeinitializeVpp();
+}
+
+scoped_ptr<VaapiPictureProvider::Picture>
+GbmVaapiPictureProvider::CreatePicture(int32 picture_buffer_id,
+                                       uint32 texture_id,
+                                       const gfx::Size& size) {
+  VASurfaceAttrib va_attribs[2];
+  VASurfaceAttribExternalBuffers va_attrib_extbuf;
+
+  ui::OzonePlatform* platform = ui::OzonePlatform::GetInstance();
+  ui::SurfaceFactoryOzone* factory = platform->GetSurfaceFactoryOzone();
+
+  scoped_refptr<ui::NativePixmap> pixmap =
+    factory->CreateNativePixmap(size, ui::SurfaceFactoryOzone::RGBA_8888);
+  struct gbm_bo* bo = static_cast<struct gbm_bo*>(pixmap->GetEGLClientBuffer());
+  unsigned long buffer_fd = pixmap->GetDmaBufFd();
+  VASurfaceID va_surface;
+
+  va_attrib_extbuf.pixel_format = VA_FOURCC_BGRX;
+  va_attrib_extbuf.width = size.width();
+  va_attrib_extbuf.height = size.height();
+  va_attrib_extbuf.data_size = size.height() * gbm_bo_get_stride (bo);

[spang, 2014/09/05 20:45:46]

Move these gbm calls into GbmPixmap & add a virtual function to NativePixmap to
get the stride.

+  va_attrib_extbuf.num_planes = 1;
+  va_attrib_extbuf.pitches[0] = gbm_bo_get_stride (bo);
+  va_attrib_extbuf.offsets[0] = 0;
+  va_attrib_extbuf.buffers = &buffer_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;
+
+  VAStatus status = vaCreateSurfaces(va_display_,
+                                     VA_RT_FORMAT_RGB32,
+                                     size.width(),
+                                     size.height(),
+                                     &va_surface,
+                                     1,
+                                     va_attribs,
+                                     arraysize(va_attribs));
+
+  scoped_ptr<Picture> picture;
+
+  if (status == VA_STATUS_SUCCESS) {
+    if (!make_context_current_.Run())
+      return picture.Pass();
+
+    EGLint attrs[] = {EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE};
+    scoped_refptr<gfx::GLImageEGL> gl_image(new gfx::GLImageEGL(size));
+    gl_image->Initialize(
+                         EGL_NATIVE_PIXMAP_KHR,
+                         pixmap->GetEGLClientBuffer(),
+                         attrs);
+
+
+    if (static_cast<int>(glGetError()) != GL_NO_ERROR)
+      return picture.Pass();
+
+    picture.reset(new GbmPicture(this,
+                                 picture_buffer_id,
+                                 texture_id,
+                                 size,
+                                 va_surface,
+                                 pixmap,
+                                 gl_image));
+  }
+
+  return picture.Pass();
+}
+
+void GbmVaapiPictureProvider::DestroyPicture(GbmPicture* gbm_picture) {
+  VASurfaceID va_surface = gbm_picture->va_surface();
+
+  if (!make_context_current_.Run())
+    return;
+
+  // ReleaseTexImage on a GLImageEGL does nothing, do deassociate
+  // the renderer texture from the image, just set the storage of
+  // that texture to NULL
+  gfx::ScopedTextureBinder texture_binder(GL_TEXTURE_2D,
+                                          gbm_picture->texture_id());
+  glTexImage2D(GL_TEXTURE_2D,
+               0,
+               GL_RGBA,
+               gbm_picture->size().width(),
+               gbm_picture->size().height(),
+               0,
+               GL_RGBA,
+               GL_UNSIGNED_BYTE,
+               NULL);
+
+  gbm_picture->gl_image()->Destroy(true);
+
+  CHECK_EQ(static_cast<int>(glGetError()), GL_NO_ERROR);
+
+  vaDestroySurfaces(va_display_, &va_surface, 1);
+}
+
+bool GbmVaapiPictureProvider::PutSurfaceIntoPicture(
+    VASurfaceID va_surface_id,
+    VaapiPictureProvider::Picture* picture) {
+  GbmPicture* gbm_picture = static_cast<GbmPicture*>(picture);
+  VAProcPipelineParameterBuffer* pipeline_param;
+  VARectangle input_region, output_region;
+
+  DCHECK(IsVppInitialized());
+
+  LOG_VA_ERROR_AND_RETURN(vaMapBuffer(va_display_,
+                                      vpp_buffer_,
+                                      (void**)&pipeline_param),
+                          "Couldn't map buffer",);
+
+  memset(pipeline_param, 0, sizeof *pipeline_param);
+
+  input_region.x = input_region.y = 0;
+  input_region.width = coded_picture_size_.width();
+  input_region.height = coded_picture_size_.height();
+  pipeline_param->surface_region = &input_region;
+  pipeline_param->surface = va_surface_id;
+  pipeline_param->surface_color_standard = VAProcColorStandardNone;
+
+  output_region.x = output_region.y = 0;
+  output_region.width = gbm_picture->size().width();
+  output_region.height = gbm_picture->size().height();
+  pipeline_param->output_region = &output_region;
+  pipeline_param->output_background_color = 0xff000000;
+  pipeline_param->output_color_standard = VAProcColorStandardNone;
+
+  LOG_VA_ERROR_AND_RETURN(vaUnmapBuffer(va_display_, vpp_buffer_),
+                          "Couldn't unmap buffer",);
+
+  LOG_VA_ERROR_AND_RETURN(vaBeginPicture(va_display_,
+                                         vpp_context_,
+                                         gbm_picture->va_surface()),
+                          "Couldn't begin picture",);
+
+  LOG_VA_ERROR_AND_RETURN(vaRenderPicture(va_display_,
+                                          vpp_context_,
+                                          &vpp_buffer_, 1),
+                          "Couldn't render picture",);
+
+  LOG_VA_ERROR_AND_RETURN(vaEndPicture(va_display_, vpp_context_),
+                          "Couldn't end picture", );
+
+  if (!make_context_current_.Run())
+    return VA_STATUS_ERROR_OPERATION_FAILED;
+
+  gfx::ScopedTextureBinder texture_binder(GL_TEXTURE_2D,
+                                          gbm_picture->texture_id());
+  gbm_picture->gl_image()->BindTexImage(GL_TEXTURE_2D);
+
+  if (static_cast<int>(glGetError()) != GL_NO_ERROR)
+    return false;
+
+  return true;
+}
+
+bool GbmVaapiPictureProvider::SetCodedSurfacesSize(const gfx::Size& size) {
+  DeinitializeVpp();
+  return InitializeVpp(size);
+}
+
+
+bool GbmVaapiPictureProvider::Initialize() {
+  return true;
+}
+
+bool GbmVaapiPictureProvider::InitializeVpp(const gfx::Size& size) {
+  LOG_VA_ERROR_AND_RETURN(vaCreateConfig(va_display_,
+                                         VAProfileNone,
+                                         VAEntrypointVideoProc,
+                                         NULL,
+                                         0,
+                                         &vpp_config_),
+                          "Couldn't create config",);
+
+  LOG_VA_ERROR_AND_RETURN(vaCreateContext(va_display_,
+                                          vpp_config_,
+                                          size.width(),
+                                          size.height(),
+                                          0,
+                                          NULL,
+                                          0,
+                                          &vpp_context_),
+                          "Couldn't create context",
+                          DeinitializeVpp());
+
+  LOG_VA_ERROR_AND_RETURN(vaCreateBuffer(va_display_,
+                                         vpp_context_,
+                                         VAProcPipelineParameterBufferType,
+                                         sizeof(VAProcPipelineParameterBuffer),
+                                         1,
+                                         NULL,
+                                         &vpp_buffer_),
+                          "Couldn't create buffer",
+                          DeinitializeVpp());
+
+  coded_picture_size_ = size;
+
+  return true;
+}
+
+bool GbmVaapiPictureProvider::IsVppInitialized() {
+  return vpp_buffer_ != VA_INVALID_ID;
+}
+
+void GbmVaapiPictureProvider::DeinitializeVpp() {
+  if (vpp_buffer_ != VA_INVALID_ID) {
+    vaDestroyBuffer(va_display_, vpp_buffer_);
+    vpp_buffer_ = VA_INVALID_ID;
+  }
+  if (vpp_context_ != VA_INVALID_ID) {
+    vaDestroyContext(va_display_, vpp_context_);
+    vpp_context_ = VA_INVALID_ID;
+  }
+  if (vpp_config_ != VA_INVALID_ID) {
+    vaDestroyConfig(va_display_, vpp_config_);
+    vpp_config_ = VA_INVALID_ID;
+  }
+}
+
+#endif  // USE_X11
+
+} // namespace
+
+
+scoped_ptr<VaapiPictureProvider> VaapiPictureProvider::Create(
+    VADisplay va_display,
+    gfx::GLContext* gl_context,
+    const base::Callback<bool(void)> make_context_current) {
+  scoped_ptr<VaapiPictureProvider> backend;
+
+#if defined(USE_X11)
+  backend.reset(new X11VaapiPictureProvider(
+      va_display,
+      static_cast<gfx::GLContextGLX*>(gl_context),
+      make_context_current));
+#else
+  backend.reset(new GbmVaapiPictureProvider(va_display,
+                                            make_context_current));
+#endif  // USE_X11
+
+  if (!backend->Initialize())
+    backend.reset();
+
+  return backend.Pass();
+}
+
+} // namespace content