Add Vaapi support on Ozone/Freon

content/common/gpu/media/vaapi_wrapper.cc

Index: content/common/gpu/media/vaapi_wrapper.cc
diff --git a/content/common/gpu/media/vaapi_wrapper.cc b/content/common/gpu/media/vaapi_wrapper.cc
index 4b5c04665fd1c9e11409a7b2ab5cd4b727dbb449..9b01bdd2f68ce5d42cd392f409df88d097a0a08c 100644
--- a/content/common/gpu/media/vaapi_wrapper.cc
+++ b/content/common/gpu/media/vaapi_wrapper.cc
@@ -18,11 +18,18 @@
 #include "ui/gl/gl_bindings.h"
 #if defined(USE_X11)
 #include "ui/gfx/x/x11_types.h"
+#elif defined(USE_OZONE)
+#include "third_party/libva/va/drm/va_drm.h"
+#include "third_party/libva/va/va_drmcommon.h"

[Pawel Osciak, 2014/12/26 00:38:56]

Needed?

[llandwerlin-old, 2014/12/26 02:50:02]

I can probably remove from here.

+#include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/public/surface_factory_ozone.h"
 #endif  // USE_X11
 
 using content_common_gpu_media::kModuleVa;
 #if defined(USE_X11)
 using content_common_gpu_media::kModuleVa_x11;
+#elif defined(USE_OZONE)
+using content_common_gpu_media::kModuleVa_drm;
 #endif  // USE_X11
 using content_common_gpu_media::InitializeStubs;
 using content_common_gpu_media::StubPathMap;
@@ -142,13 +149,17 @@ VaapiWrapper::VaapiWrapper()
     : va_display_(NULL),
       va_config_id_(VA_INVALID_ID),
       va_context_id_(VA_INVALID_ID),
-      va_initialized_(false) {
+      va_initialized_(false),
+      va_vpp_config_id_(VA_INVALID_ID),
+      va_vpp_context_id_(VA_INVALID_ID),
+      va_vpp_buffer_id_(VA_INVALID_ID) {
 }
 
 VaapiWrapper::~VaapiWrapper() {
   DestroyPendingBuffers();
   DestroyCodedBuffers();
   DestroySurfaces();
+  DeinitializeVpp();
   Deinitialize();
 }
 
@@ -227,6 +238,11 @@ bool VaapiWrapper::VaInitialize(const base::Closure& report_error_to_uma_cb) {
 
 #if defined(USE_X11)
   va_display_ = vaGetDisplay(gfx::GetXDisplay());
+#elif defined(USE_OZONE)
+  ui::OzonePlatform* platform = ui::OzonePlatform::GetInstance();

[Pawel Osciak, 2014/12/26 00:38:56]

Please check return values.

[llandwerlin-old, 2014/12/26 02:50:02]

Same as
https://codereview.chromium.org/490233002/diff/540001/content/common/gpu/medi...

I can add checks, but I would argue it's about the same as checking the value of
gfx::GetXDisplay().

+  ui::SurfaceFactoryOzone* factory = platform->GetSurfaceFactoryOzone();
+
+  va_display_ = vaGetDisplayDRM(factory->GetDrmFd());
 #endif  // USE_X11
 
   if (!vaDisplayIsValid(va_display_)) {
@@ -445,6 +461,35 @@ void VaapiWrapper::DestroySurfaces() {
   va_context_id_ = VA_INVALID_ID;
 }
 
+scoped_refptr<VASurface> VaapiWrapper::CreateUnownedSurface(
+    unsigned int va_format,
+    const gfx::Size& size,
+    VASurfaceAttrib* va_attribs,
+    size_t num_va_attribs) {
+  base::AutoLock auto_lock(va_lock_);
+  VASurfaceID va_surface_id;
+  scoped_refptr<VASurface> va_surface;

[Pawel Osciak, 2014/12/26 00:38:56]

Please define variables at use site.

[llandwerlin-old, 2014/12/26 02:50:02]

Done.

+
+  VAStatus va_res =
+      vaCreateSurfaces(va_display_, va_format, size.width(), size.height(),
+                       &va_surface_id, 1, va_attribs, num_va_attribs);
+  VA_SUCCESS_OR_RETURN(va_res, "Failed to create unowned VASurface",
+                       va_surface);
+
+  va_surface = new VASurface(va_surface_id, size,
+                             base::Bind(&VaapiWrapper::DestroyUnownedSurface,
+                                        make_scoped_refptr(this)));

[Pawel Osciak, 2014/12/26 00:38:56]

We can't do this. We can't have VaapiVDA keep a scoped_ptr and then some other
classes scoped_refptrs. We can either maintain the lifetime of the wrapper
manually via scoped_ptr and unowned pointers, or via refptrs, but we can't mix
these.

[llandwerlin-old, 2014/12/26 02:50:02]

Thanks, will change to Unretained.

+
+  return va_surface;
+}
+
+void VaapiWrapper::DestroyUnownedSurface(VASurfaceID va_surface) {
+  base::AutoLock auto_lock(va_lock_);
+
+  VAStatus va_res = vaDestroySurfaces(va_display_, &va_surface, 1);
+  VA_LOG_ON_ERROR(va_res, "vaDestroySurfaces on output surface failed");

[Pawel Osciak, 2014/12/26 00:38:56]

s/output//

[llandwerlin-old, 2014/12/26 02:50:02]

Done.

+}
+
 bool VaapiWrapper::SubmitBuffer(VABufferType va_buffer_type,
                                 size_t size,
                                 void* buffer) {
@@ -757,6 +802,98 @@ bool VaapiWrapper::DownloadAndDestroyCodedBuffer(VABufferID buffer_id,
   return buffer_segment == NULL;
 }
 
+bool VaapiWrapper::BlitSurface(VASurfaceID va_surface_id_src,
+                               const gfx::Size& src_size,
+                               VASurfaceID va_surface_id_dest,
+                               const gfx::Size& dest_size) {
+  base::AutoLock auto_lock(va_lock_);
+
+  // Initialize the post processing engine if not already done.
+  if (va_vpp_buffer_id_ == VA_INVALID_ID) {

[Pawel Osciak, 2014/12/26 00:38:56]

Maybe just do this in Initialize() ?

[llandwerlin-old, 2014/12/26 02:50:02]

That's up to you. The reason it's done lazily at the moment is to avoid to do it
for encoders instances or on X11.

[Pawel Osciak, 2014/12/29 00:08:00]

Acknowledged.

+    if (!InitializeVpp_Locked())
+      return false;
+  }
+
+  VAProcPipelineParameterBuffer* pipeline_param;
+  VA_SUCCESS_OR_RETURN(vaMapBuffer(va_display_, va_vpp_buffer_id_,
+                                   reinterpret_cast<void**>(&pipeline_param)),
+                       "Couldn't map vpp buffer", false);
+
+  memset(pipeline_param, 0, sizeof *pipeline_param);
+
+  VARectangle input_region;
+  input_region.x = input_region.y = 0;
+  input_region.width = src_size.width();
+  input_region.height = src_size.height();
+  pipeline_param->surface_region = &input_region;
+  pipeline_param->surface = va_surface_id_src;
+  pipeline_param->surface_color_standard = VAProcColorStandardNone;
+
+  VARectangle output_region;
+  output_region.x = output_region.y = 0;
+  output_region.width = dest_size.width();
+  output_region.height = dest_size.height();
+  pipeline_param->output_region = &output_region;
+  pipeline_param->output_background_color = 0xff000000;

[Pawel Osciak, 2014/12/26 00:38:56]

Do we have a constant we could use here?

[llandwerlin-old, 2014/12/26 02:50:02]

Not yet. I can add one here, let me know.

+  pipeline_param->output_color_standard = VAProcColorStandardNone;
+
+  VA_SUCCESS_OR_RETURN(vaUnmapBuffer(va_display_, va_vpp_buffer_id_),
+                       "Couldn't unmap vpp buffer", false);
+
+  VA_SUCCESS_OR_RETURN(
+      vaBeginPicture(va_display_, va_vpp_context_id_, va_surface_id_dest),
+      "Couldn't begin picture", false);
+
+  VA_SUCCESS_OR_RETURN(
+      vaRenderPicture(va_display_, va_vpp_context_id_, &va_vpp_buffer_id_, 1),
+      "Couldn't render picture", false);
+
+  VA_SUCCESS_OR_RETURN(vaEndPicture(va_display_, va_vpp_context_id_),
+                       "Couldn't end picture", false);
+
+  return true;
+}
+
+bool VaapiWrapper::InitializeVpp_Locked() {
+  va_lock_.AssertAcquired();
+
+  VA_SUCCESS_OR_RETURN(
+      vaCreateConfig(va_display_, VAProfileNone, VAEntrypointVideoProc, NULL, 0,
+                     &va_vpp_config_id_),
+      "Couldn't create config", false);
+
+  // The size of the picture for the context is irrelevant in the case
+  // of the VPP, just passing 1x1.
+  VA_SUCCESS_OR_RETURN(vaCreateContext(va_display_, va_vpp_config_id_, 1, 1, 0,
+                                       NULL, 0, &va_vpp_context_id_),
+                       "Couldn't create context", false);
+
+  VA_SUCCESS_OR_RETURN(vaCreateBuffer(va_display_, va_vpp_context_id_,
+                                      VAProcPipelineParameterBufferType,
+                                      sizeof(VAProcPipelineParameterBuffer), 1,
+                                      NULL, &va_vpp_buffer_id_),
+                       "Couldn't create buffer", false);
+
+  return true;
+}
+
+void VaapiWrapper::DeinitializeVpp() {
+  base::AutoLock auto_lock(va_lock_);
+
+  if (va_vpp_buffer_id_ != VA_INVALID_ID) {
+    vaDestroyBuffer(va_display_, va_vpp_buffer_id_);
+    va_vpp_buffer_id_ = VA_INVALID_ID;
+  }
+  if (va_vpp_context_id_ != VA_INVALID_ID) {
+    vaDestroyContext(va_display_, va_vpp_context_id_);
+    va_vpp_context_id_ = VA_INVALID_ID;
+  }
+  if (va_vpp_config_id_ != VA_INVALID_ID) {
+    vaDestroyConfig(va_display_, va_vpp_config_id_);
+    va_vpp_config_id_ = VA_INVALID_ID;
+  }
+}
+
 // static
 bool VaapiWrapper::PostSandboxInitialization() {
   StubPathMap paths;
@@ -765,6 +902,8 @@ bool VaapiWrapper::PostSandboxInitialization() {
 
 #if defined(USE_X11)
   paths[kModuleVa_x11].push_back("libva-x11.so.1");
+#elif defined(USE_OZONE)
+  paths[kModuleVa_drm].push_back("libva-drm.so.1");
 #endif
 
   return InitializeStubs(paths);