VaapiVideoAccelerator: make Vaapi accelerator work with ozone

content/common/gpu/media/vaapi_picture.h

Index: content/common/gpu/media/vaapi_picture.h
diff --git a/content/common/gpu/media/vaapi_picture.h b/content/common/gpu/media/vaapi_picture.h
new file mode 100644
index 0000000000000000000000000000000000000000..966aa40fae482a13caa840e4d31b75c6bf22c389
--- /dev/null
+++ b/content/common/gpu/media/vaapi_picture.h
@@ -0,0 +1,78 @@
+// 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 interface of output pictures for the Vaapi
+// video decoder. This is implemented by different window system
+// (X11/Ozone) and used by VaapiVideoDecodeAccelerator to produce
+// output pictures.
+
+#ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_PICTURE_H_
+#define CONTENT_COMMON_GPU_MEDIA_VAAPI_PICTURE_H_
+
+#include "base/callback.h"
+#include "base/memory/linked_ptr.h"
+#include "base/memory/ref_counted.h"
+#include "base/threading/non_thread_safe.h"
+#include "ui/gfx/size.h"
+
+namespace gfx {
+class GLContext;
+}  // namespace gfx
+
+namespace content {
+
+class VASurface;
+class VaapiWrapper;
+
+// Picture is native pixmap abstraction (X11/Ozone).
+class VaapiPicture : public base::NonThreadSafe {
+ public:
+  virtual ~VaapiPicture() {}

[scherkus (not reviewing), 2014/12/10 18:56:48]

s/virtual/override/

[llandwerlin-old, 2014/12/13 15:23:54]

Replacing virtual by override doesn't compile on ChromeOS :

In file included from src/content/common/gpu/media/vaapi_picture.cc:5:0:
src/content/common/gpu/media/vaapi_picture.h:31:3: error:
'content::VaapiPicture::~VaapiPicture()' marked override, but does not override
   ~VaapiPicture() override {}
   ^
In file included from src/content/common/gpu/media/vaapi_picture.cc:12:0:
src/content/common/gpu/media/vaapi_drm_picture.h:38:3: error:
'content::VaapiDrmPicture::~VaapiDrmPicture()' marked override, but does not
override
   ~VaapiDrmPicture() override;
   ^
In file included from src/content/common/gpu/media/vaapi_picture.h:14:0,
                 from src/content/common/gpu/media/vaapi_picture.cc:5:
src/base/memory/linked_ptr.h: In instantiation of 'void linked_ptr<T>::depart()
[with T = content::VaapiPicture]':
src/base/memory/linked_ptr.h:84:26:   required from
'linked_ptr<T>::~linked_ptr() [with T = content::VaapiPicture]'
src/content/common/gpu/media/vaapi_picture.cc:25:28:   required from here
src/base/memory/linked_ptr.h:146:25: error: deleting object of abstract class
type 'content::VaapiPicture' which has non-virtual destructor will cause
undefined behaviour [-Werror=delete-non-virtual-dtor]
     if (link_.depart()) delete value_;
                         ^
cc1plus: all warnings being treated as errors

+
+  // Try to allocate the underlying resources for the picture.
+  virtual bool Initialize() = 0;
+
+  int32 picture_buffer_id() const { return picture_buffer_id_; }
+  uint32 texture_id() const { return texture_id_; }
+  const gfx::Size& size() const { return size_; }
+
+  // Downloads the |va_surface| into the picture, potentially scaling
+  // it if needed.
+  virtual bool DownloadFromSurface(
+      const scoped_refptr<VASurface>& va_surface) = 0;
+
+  // Create a VaapiPicture of |size| to be associated with
+  // |picture_buffer_id| and bound to |texture_id|. |gl_context| and
+  // |make_context_current| are provided for the GL operations.
+  static linked_ptr<VaapiPicture> CreatePicture(
+      const scoped_refptr<VaapiWrapper>& vaapi_wrapper,
+      gfx::GLContext* gl_context,
+      const base::Callback<bool(void)> make_context_current,
+      int32 picture_buffer_id,
+      uint32 texture_id,
+      const gfx::Size& size);
+
+  // Get the texture target used to bind EGLImages (either
+  // GL_TEXTURE_2D on X11 or GL_TEXTURE_EXTERNAL_OES on DRM).
+  static uint32 GetGLTextureTarget();
+
+ protected:
+  VaapiPicture(int32 picture_buffer_id,
+               uint32 texture_id,
+               const gfx::Size& size)
+      : picture_buffer_id_(picture_buffer_id),
+        texture_id_(texture_id),
+        size_(size) {}
+
+ private:
+  int32 picture_buffer_id_;
+  uint32 texture_id_;
+  gfx::Size size_;
+
+  DISALLOW_COPY_AND_ASSIGN(VaapiPicture);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_PICTURE_H_