Add Vaapi support on Ozone/Freon

content/common/gpu/media/vaapi_drm_picture.h

Index: content/common/gpu/media/vaapi_drm_picture.h
diff --git a/content/common/gpu/media/vaapi_drm_picture.h b/content/common/gpu/media/vaapi_drm_picture.h
new file mode 100644
index 0000000000000000000000000000000000000000..d3f743eebff06409851bb4e796ebbc2ae176b1db
--- /dev/null
+++ b/content/common/gpu/media/vaapi_drm_picture.h
@@ -0,0 +1,62 @@
+// 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.
+//
+// This file contains an implementation of picture allocation for the
+// Ozone window system used by VaapiVideoDecodeAccelerator to produce
+// output pictures.
+
+#ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_
+#define CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_
+
+#include "base/callback.h"
+#include "base/memory/ref_counted.h"
+#include "content/common/gpu/media/vaapi_picture.h"
+#include "ui/gfx/size.h"
+
+namespace gfx {
+class GLImageLinuxDMABuffer;
+}
+
+namespace ui {
+class NativePixmap;
+}
+
+namespace content {
+
+class VaapiWrapper;
+
+// Implementation of VaapiPicture for the ozone/drm backed chromium.
+class VaapiDrmPicture : public VaapiPicture {
+ public:
+  VaapiDrmPicture(VaapiWrapper* vaapi_wrapper,
+                  const base::Callback<bool(void)>& make_context_current,
+                  int32 picture_buffer_id,
+                  uint32 texture_id,
+                  const gfx::Size& size);
+
+  ~VaapiDrmPicture() override;
+
+  bool Initialize() override;
+
+  bool DownloadFromSurface(const scoped_refptr<VASurface>& va_surface) override;
+
+ private:
+  VaapiWrapper* vaapi_wrapper_;  // Not owned.
+  base::Callback<bool(void)> make_context_current_;
+
+  // Ozone buffer, the storage of the EGLImage and the VASurface.

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

I don't think the pixmap is also the storage of va surface? Would we have to
download to eglimage from the surface had that been the case?

[llandwerlin-old, 2014/12/29 02:30:34]

The pixmap is the storage of both the VASurface and the EGLImage below.

+  scoped_refptr<ui::NativePixmap> pixmap_;

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

Did scoped_ptrs not work out?

[llandwerlin-old, 2014/12/29 02:30:34]

No, the classes implementing base::RefCounted have to make their destructor
protected or private, which makes it impossible to use with scoped_ptr.

+
+  // EGLImage bound to the GL textures used by the VDA client.
+  scoped_refptr<gfx::GLImageLinuxDMABuffer> gl_image_;
+
+  // VASurface used to transfer from NV12 pixel format.

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

I don't think we explicitly use nv12 (or any format) for the surface anywhere in
this class (even if we do so in the accelerators), do we need to say it here? My
point is, if accelerators change in the future, I think this could be used with
other formats assuming vaapi understood them?

[llandwerlin-old, 2014/12/29 02:30:34]

Ok, I won't make reference to the input format here.

+  scoped_refptr<VASurface> va_surface_;
+
+  DISALLOW_COPY_AND_ASSIGN(VaapiDrmPicture);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_