VaapiVideoAccelerator: make Vaapi accelerator work with ozone

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..f92987da93d5022311bf5462204c22d733ee586e
--- /dev/null
+++ b/content/common/gpu/media/vaapi_drm_picture.h
@@ -0,0 +1,60 @@
+// 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/weak_ptr.h"
+#include "content/common/gpu/media/vaapi_picture.h"
+#include "third_party/libva/va/va.h"

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

This include should probably be in the .cc file.

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

Acknowledged.

+#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(base::WeakPtr<VaapiWrapper> vaapi_wrapper,
+                  const base::Callback<bool(void)> make_context_current,
+                  int32 picture_buffer_id,
+                  uint32 texture_id,
+                  const gfx::Size& size);
+
+  virtual ~VaapiDrmPicture();
+
+  bool Initialize() override;
+
+  virtual bool DownloadFromSurface(
+      const scoped_refptr<VASurface>& va_surface) override;
+
+  virtual void DisposeVaapi() override;
+
+ private:
+  base::WeakPtr<VaapiWrapper> vaapi_wrapper_;
+  base::Callback<bool(void)> make_context_current_;
+  scoped_refptr<VASurface> va_surface_;
+  scoped_refptr<ui::NativePixmap> pixmap_;
+  scoped_refptr<gfx::GLImageLinuxDMABuffer> egl_image_;
+
+  DISALLOW_COPY_AND_ASSIGN(VaapiDrmPicture);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_