content: Add support for Video Decode Acceleration on GBM

content/common/gpu/media/vaapi_video_decode_accelerator.cc

 // Copyright (c) 2012 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_video_decode_accelerator.h"
+
+#if !defined(USE_X11)
+#include <gbm.h>
+#endif
+
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/common/gpu/gpu_channel.h"
-#include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/video/picture.h"
 #include "ui/gl/gl_bindings.h"
+#if !defined(USE_X11)
+#include "ui/gl/gl_surface_egl.h"
+#endif
 #include "ui/gl/scoped_binders.h"
 
 static void ReportToUMA(
     content::VaapiH264Decoder::VAVDAH264DecoderFailure failure) {
   UMA_HISTOGRAM_ENUMERATION(
       "Media.VAVDAH264.DecoderFailure",
       failure,
       content::VaapiH264Decoder::VAVDA_H264_DECODER_FAILURES_MAX);
 }
 
@@ skipping 39 matching lines @@
 // at the end of decode (or when a new set of PictureBuffers is required).
 //
 // TFPPictures are used for output, contents of VASurfaces passed from decoder
 // are put into the associated pixmap memory and sent to client.
 class VaapiVideoDecodeAccelerator::TFPPicture : public base::NonThreadSafe {
  public:
   ~TFPPicture();
 
   static linked_ptr<TFPPicture> Create(
       const base::Callback<bool(void)>& make_context_current,
+#if defined(USE_X11)
       const GLXFBConfig& fb_config,
       Display* x_display,
+#else
+      int fd,
+      VaapiWrapper* va_wrapper,
+#endif
       int32 picture_buffer_id,
       uint32 texture_id,
       gfx::Size size);
 
   int32 picture_buffer_id() {
     return picture_buffer_id_;
   }
 
   gfx::Size size() {
     return size_;
   }
-
+#if defined(USE_X11)
   int x_pixmap() {
     return x_pixmap_;
   }
 
   // Bind texture to pixmap. Needs to be called every frame.
   bool Bind();
+#else
+  // Upload vaimage data to texture. Needs to be called every frame.
+  bool Upload(VASurfaceID id);
+#endif
 
  private:
   TFPPicture(const base::Callback<bool(void)>& make_context_current,
+#if defined(USE_X11)
              Display* x_display,
+#else
+             int fd,
+             VaapiWrapper* va_wrapper,
+#endif
              int32 picture_buffer_id,
              uint32 texture_id,
              gfx::Size size);
 
+#if defined(USE_X11)
   bool Initialize(const GLXFBConfig& fb_config);
 
   base::Callback<bool(void)> make_context_current_;
 
   Display* x_display_;
+#else
+  bool Initialize();
+
+  base::Callback<bool(void)> make_context_current_;
+
+  VaapiWrapper* va_wrapper_;
+#endif
 
   // Output id for the client.
   int32 picture_buffer_id_;
   uint32 texture_id_;
 
   gfx::Size size_;
-
+#if defined(USE_X11)
   // Pixmaps bound to this texture.
   Pixmap x_pixmap_;
   GLXPixmap glx_pixmap_;
-
+#else
+  VAImage va_image_;
+#endif
   DISALLOW_COPY_AND_ASSIGN(TFPPicture);
 };
 
 VaapiVideoDecodeAccelerator::TFPPicture::TFPPicture(
     const base::Callback<bool(void)>& make_context_current,
+#if defined(USE_X11)
     Display* x_display,
+#else
+    int fd,
+    VaapiWrapper* va_wrapper,
+#endif
     int32 picture_buffer_id,
     uint32 texture_id,
     gfx::Size size)
     : make_context_current_(make_context_current),
+#if defined(USE_X11)
       x_display_(x_display),
+      x_pixmap_(0),
+      glx_pixmap_(0),
+#else
+      va_wrapper_(va_wrapper),
+#endif
       picture_buffer_id_(picture_buffer_id),
       texture_id_(texture_id),
-      size_(size),
-      x_pixmap_(0),
-      glx_pixmap_(0) {
+      size_(size) {
   DCHECK(!make_context_current_.is_null());
 };
 
 linked_ptr<VaapiVideoDecodeAccelerator::TFPPicture>
 VaapiVideoDecodeAccelerator::TFPPicture::Create(
     const base::Callback<bool(void)>& make_context_current,
+#if defined(USE_X11)
     const GLXFBConfig& fb_config,
     Display* x_display,
+#else
+    int fd,
+    VaapiWrapper* va_wrapper,
+#endif
     int32 picture_buffer_id,
     uint32 texture_id,
     gfx::Size size) {
 
   linked_ptr<TFPPicture> tfp_picture(
-      new TFPPicture(make_context_current, x_display, picture_buffer_id,
-                     texture_id, size));
-
+      new TFPPicture(make_context_current,
+#if defined(USE_X11)
+                     x_display,
+#else
+                     fd,
+                     va_wrapper,
+#endif
+                     picture_buffer_id,
+                     texture_id,
+                     size));
+#if defined(USE_X11)
   if (!tfp_picture->Initialize(fb_config))
+#else
+  if (!tfp_picture->Initialize())
+#endif
     tfp_picture.reset();
 
   return tfp_picture;
 }
 
+#if defined(USE_X11)
 bool VaapiVideoDecodeAccelerator::TFPPicture::Initialize(
     const GLXFBConfig& fb_config) {
+#else
+bool VaapiVideoDecodeAccelerator::TFPPicture::Initialize() {
+#endif
   DCHECK(CalledOnValidThread());
   if (!make_context_current_.Run())
     return false;
-
+#if defined(USE_X11)
   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
   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 false;
   }
 
   static const int pixmap_attr[] = {
     GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT,
     GLX_TEXTURE_FORMAT_EXT, GLX_TEXTURE_FORMAT_RGB_EXT,
     GL_NONE,
   };
 
   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";
     return false;
   }
-
+#else
+  if (!va_wrapper_->CreateRGBImage(size_, &va_image_)) {
+    DVLOG(1) << "Failed to create VAImage";
+    return false;
+  }
+#endif
   return true;
 }
 
 VaapiVideoDecodeAccelerator::TFPPicture::~TFPPicture() {
   DCHECK(CalledOnValidThread());
+#if defined(USE_X11)
   // Unbind surface from texture and deallocate resources.
   if (glx_pixmap_ && make_context_current_.Run()) {
     glXReleaseTexImageEXT(x_display_, glx_pixmap_, GLX_FRONT_LEFT_EXT);
     glXDestroyPixmap(x_display_, glx_pixmap_);
   }
 
   if (x_pixmap_)
     XFreePixmap(x_display_, x_pixmap_);
   XSync(x_display_, False);  // Needed to work around buggy vdpau-driver.
+#else
+  if (va_wrapper_)
+    va_wrapper_->DestroyImage(&va_image_);
+#endif
 }
 
+#if defined(USE_X11)
 bool VaapiVideoDecodeAccelerator::TFPPicture::Bind() {
   DCHECK(CalledOnValidThread());
   DCHECK(x_pixmap_);
   DCHECK(glx_pixmap_);
   if (!make_context_current_.Run())
     return false;
 
   gfx::ScopedTextureBinder texture_binder(GL_TEXTURE_2D, texture_id_);
   glXBindTexImageEXT(x_display_, glx_pixmap_, GLX_FRONT_LEFT_EXT, NULL);
 
   return true;
 }
+#else
+bool VaapiVideoDecodeAccelerator::TFPPicture::Upload(VASurfaceID surface) {
+  DCHECK(CalledOnValidThread());
+  if (!make_context_current_.Run())
+    return false;
+
+
+  if (!va_wrapper_->PutSurfaceIntoImage(surface, &va_image_)) {
+    DVLOG(1) << "Failed to put va surface to image";
+    return false;
+  }
+
+  void* buffer = NULL;
+  if (!va_wrapper_->MapImage(&va_image_, &buffer)) {
+    DVLOG(1) << "Failed to map VAImage";
+    return false;
+  }
+
+  gfx::ScopedTextureBinder texture_binder(GL_TEXTURE_2D, texture_id_);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size_.width(), size_.height(),
+               0, GL_RGBA, GL_UNSIGNED_BYTE, buffer);

[marcheu, 2014/08/07 01:26:25]

This is a synchronous, CPU-side copy. This copy does not exist today with the
X11 TFP path today (we use zero-copy there) and there is no reason to add it.

Can we use an eglimage instead?

[vignatti (out of this project), 2014/08/12 08:19:02]

FYI point taken. We are working on that.

+
+  va_wrapper_->UnmapImage(&va_image_);
+
+  return true;
+}
+#endif
 
 VaapiVideoDecodeAccelerator::TFPPicture*
     VaapiVideoDecodeAccelerator::TFPPictureById(int32 picture_buffer_id) {
   TFPPictures::iterator it = tfp_pictures_.find(picture_buffer_id);
   if (it == tfp_pictures_.end()) {
     DVLOG(1) << "Picture id " << picture_buffer_id << " does not exist";
     return NULL;
   }
 
   return it->second.get();
 }
 
 VaapiVideoDecodeAccelerator::VaapiVideoDecodeAccelerator(
+#if defined(USE_X11)
     Display* x_display,
+#endif
     const base::Callback<bool(void)>& make_context_current)
+#if defined(USE_X11)
     : x_display_(x_display),
+#else
+    : fd_(0),
+#endif
       make_context_current_(make_context_current),
       state_(kUninitialized),
       input_ready_(&lock_),
       surfaces_available_(&lock_),
       message_loop_(base::MessageLoop::current()),
       decoder_thread_("VaapiDecoderThread"),
       num_frames_at_client_(0),
       num_stream_bufs_at_decoder_(0),
       finish_flush_pending_(false),
       awaiting_va_surfaces_recycle_(false),
       requested_num_pics_(0),
       weak_this_factory_(this) {
   weak_this_ = weak_this_factory_.GetWeakPtr();
   va_surface_release_cb_ = media::BindToCurrentLoop(
       base::Bind(&VaapiVideoDecodeAccelerator::RecycleVASurfaceID, weak_this_));
 }
 
 VaapiVideoDecodeAccelerator::~VaapiVideoDecodeAccelerator() {
   DCHECK_EQ(message_loop_, base::MessageLoop::current());
+#if !defined(USE_X11)
+  fd_ = 0;
+#endif
 }
 
+#if defined(USE_X11)
 class XFreeDeleter {
  public:
   void operator()(void* x) const {
     ::XFree(x);
   }
 };
 
 bool VaapiVideoDecodeAccelerator::InitializeFBConfig() {
   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)
     return false;
   if (!num_fbconfigs)
     return false;
 
   fb_config_ = glx_fb_configs.get()[0];
   return true;
 }
+#endif
 
 bool VaapiVideoDecodeAccelerator::Initialize(media::VideoCodecProfile profile,
                                              Client* client) {
   DCHECK_EQ(message_loop_, base::MessageLoop::current());
 
   client_ptr_factory_.reset(new base::WeakPtrFactory<Client>(client));
   client_ = client_ptr_factory_->GetWeakPtr();
 
   base::AutoLock auto_lock(lock_);
   DCHECK_EQ(state_, kUninitialized);
   DVLOG(2) << "Initializing VAVDA, profile: " << profile;
 
   if (!make_context_current_.Run())
     return false;
 
+#if defined(USE_X11)
   if (!InitializeFBConfig()) {
     DVLOG(1) << "Could not get a usable FBConfig";
     return false;
   }
+#else
+  gbm_device* device = NULL;
+  device = reinterpret_cast<gbm_device*>(
+      gfx::GetPlatformDefaultEGLNativeDisplay());
+  fd_ = gbm_device_get_fd(device);
+  if (!fd_) {
+    DVLOG(1) << "Could not get a usable DRM device";
+    return false;
+  }
+#endif
 
   vaapi_wrapper_ = VaapiWrapper::Create(
       VaapiWrapper::kDecode,
       profile,
+#if defined(USE_X11)
       x_display_,
+#else
+      fd_,
+#endif
       base::Bind(&ReportToUMA, content::VaapiH264Decoder::VAAPI_ERROR));
 
   if (!vaapi_wrapper_.get()) {
     DVLOG(1) << "Failed initializing VAAPI";
     return false;
   }
 
   decoder_.reset(
       new VaapiH264Decoder(
           vaapi_wrapper_.get(),
@@ skipping 32 matching lines @@
   DCHECK_EQ(message_loop_, base::MessageLoop::current());
 
   int32 output_id  = tfp_picture->picture_buffer_id();
 
   TRACE_EVENT2("Video Decoder", "VAVDA::OutputSurface",
                "input_id", input_id,
                "output_id", output_id);
 
   DVLOG(3) << "Outputting VASurface " << va_surface->id()
            << " into pixmap bound to picture buffer id " << output_id;
-
+#if defined(USE_X11)
   RETURN_AND_NOTIFY_ON_FAILURE(tfp_picture->Bind(),
                                "Failed binding texture to pixmap",
                                PLATFORM_FAILURE, );
 
   RETURN_AND_NOTIFY_ON_FAILURE(
       vaapi_wrapper_->PutSurfaceIntoPixmap(va_surface->id(),
                                            tfp_picture->x_pixmap(),
                                            tfp_picture->size()),
       "Failed putting surface into pixmap", PLATFORM_FAILURE, );
-
+#else
+  RETURN_AND_NOTIFY_ON_FAILURE(
+      tfp_picture->Upload(va_surface->id()),
+      "Failed putting surface into pixmap", PLATFORM_FAILURE, );
+#endif
   // Notify the client a picture is ready to be displayed.
   ++num_frames_at_client_;
   TRACE_COUNTER1("Video Decoder", "Textures at client", num_frames_at_client_);
   DVLOG(4) << "Notifying output picture id " << output_id
            << " for input "<< input_id << " is ready";
   if (client_)
     client_->PictureReady(media::Picture(output_id, input_id));
 }
 
 void VaapiVideoDecodeAccelerator::TryOutputSurface() {
@@ skipping 51 matching lines @@
 
 bool VaapiVideoDecodeAccelerator::GetInputBuffer_Locked() {
   DCHECK(decoder_thread_proxy_->BelongsToCurrentThread());
   lock_.AssertAcquired();
 
   if (curr_input_buffer_.get())
     return true;
 
   // Will only wait if it is expected that in current state new buffers will
   // be queued from the client via Decode(). The state can change during wait.
-  while (input_buffers_.empty() && (state_ == kDecoding || state_ == kIdle)) {
+  while (input_buffers_.empty() && (state_ == kDecoding || state_ == kIdle))
     input_ready_.Wait();
-  }
 
   // We could have got woken up in a different state or never got to sleep
   // due to current state; check for that.
   switch (state_) {
     case kFlushing:
       // Here we are only interested in finishing up decoding buffers that are
       // already queued up. Otherwise will stop decoding.
       if (input_buffers_.empty())
         return false;
       // else fallthrough
@@ skipping 34 matching lines @@
   --num_stream_bufs_at_decoder_;
   TRACE_COUNTER1("Video Decoder", "Stream buffers at decoder",
                  num_stream_bufs_at_decoder_);
 }
 
 bool VaapiVideoDecodeAccelerator::FeedDecoderWithOutputSurfaces_Locked() {
   lock_.AssertAcquired();
   DCHECK(decoder_thread_proxy_->BelongsToCurrentThread());
 
   while (available_va_surfaces_.empty() &&
-         (state_ == kDecoding || state_ == kFlushing || state_ == kIdle)) {
+         (state_ == kDecoding || state_ == kFlushing || state_ == kIdle))
     surfaces_available_.Wait();
-  }
 
   if (state_ != kDecoding && state_ != kFlushing && state_ != kIdle)
     return false;
 
   while (!available_va_surfaces_.empty()) {
     scoped_refptr<VASurface> va_surface(
         new VASurface(available_va_surfaces_.front(), va_surface_release_cb_));
     available_va_surfaces_.pop_front();
     decoder_->ReuseSurface(va_surface);
   }
@@ skipping 187 matching lines @@
                                      &va_surface_ids),
       "Failed creating VA Surfaces", PLATFORM_FAILURE, );
   DCHECK_EQ(va_surface_ids.size(), buffers.size());
 
   for (size_t i = 0; i < buffers.size(); ++i) {
     DVLOG(2) << "Assigning picture id: " << buffers[i].id()
              << " to texture id: " << buffers[i].texture_id()
              << " VASurfaceID: " << va_surface_ids[i];
 
     linked_ptr<TFPPicture> tfp_picture(
-        TFPPicture::Create(make_context_current_, fb_config_, x_display_,
-                           buffers[i].id(), buffers[i].texture_id(),
+        TFPPicture::Create(make_context_current_,
+#if defined(USE_X11)
+                           fb_config_,
+                           x_display_,
+#else
+                           fd_,
+                           vaapi_wrapper_.get(),
+#endif
+                           buffers[i].id(),
+                           buffers[i].texture_id(),
                            requested_pic_size_));
 
     RETURN_AND_NOTIFY_ON_FAILURE(
         tfp_picture.get(), "Failed assigning picture buffer to a texture.",
         PLATFORM_FAILURE, );
 
     bool inserted = tfp_pictures_.insert(std::make_pair(
         buffers[i].id(), tfp_picture)).second;
     DCHECK(inserted);
 
@@ skipping 195 matching lines @@
   DCHECK_EQ(message_loop_, base::MessageLoop::current());
   Cleanup();
   delete this;
 }
 
 bool VaapiVideoDecodeAccelerator::CanDecodeOnIOThread() {
   return false;
 }
 
 }  // namespace content