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_tfp_picture.h b/content/common/gpu/media/vaapi_drm_picture.h
similarity index 54%
copy from content/common/gpu/media/vaapi_tfp_picture.h
copy to content/common/gpu/media/vaapi_drm_picture.h
index c6deba4256bfc5a6b37d6ff9b5e254319132a746..a27937efe76317bf8facfb89f7b5d90429c1ad80 100644
--- a/content/common/gpu/media/vaapi_tfp_picture.h
+++ b/content/common/gpu/media/vaapi_drm_picture.h
@@ -3,54 +3,54 @@
 // found in the LICENSE file.
 //
 // This file contains an implementation of picture allocation for the
-// X11 window system used by VaapiVideoDecodeAccelerator to produce
+// Ozone window system used by VaapiVideoDecodeAccelerator to produce
 // output pictures.
 
-#ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_TFP_PICTURE_H_
-#define CONTENT_COMMON_GPU_MEDIA_VAAPI_TFP_PICTURE_H_
+#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"
-#include "ui/gl/gl_bindings.h"
 
 namespace gfx {
-class GLImageGLX;
-class GLContextGLX;
+class GLImageLinuxDMABuffer;
+}
+
+namespace ui {
+class NativePixmap;
 }
 
 namespace content {
 
 class VaapiWrapper;
 
-// Implementation of VaapiPicture for the X11 backed chromium.
-class VaapiTFPPicture : public VaapiPicture {
+// Implementation of VaapiPicture for the ozone/drm backed chromium.
+class VaapiDrmPicture : public VaapiPicture {
  public:
-  VaapiTFPPicture(VaapiWrapper* vaapi_wrapper,
+  VaapiDrmPicture(VaapiWrapper* vaapi_wrapper,
                   const base::Callback<bool(void)> make_context_current,
                   int32 picture_buffer_id,
                   uint32 texture_id,
                   const gfx::Size& size);
 
-  ~VaapiTFPPicture() override;
+  ~VaapiDrmPicture() override;
 
   bool Initialize() override;
 
   bool DownloadFromSurface(const scoped_refptr<VASurface>& va_surface) override;
 
  private:
-  VaapiWrapper* vaapi_wrapper_;  // Not owned.
-
+  VaapiWrapper *vaapi_wrapper_;  // Not owned.

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

'*' next to class name please.

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

Done.

   base::Callback<bool(void)> make_context_current_;
-  Display* x_display_;
-
-  Pixmap x_pixmap_;
-  scoped_refptr<gfx::GLImageGLX> glx_image_;
+  scoped_refptr<VASurface> va_surface_;

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

Do we need scopers in this class to be refcounted?

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

I can probably move them to scoped_ptr. This is going to bring back the .get()
in vaapi_drm_picture.cc though.

+  scoped_refptr<ui::NativePixmap> pixmap_;

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

Please add a comment what this is.

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

Done.

+  scoped_refptr<gfx::GLImageLinuxDMABuffer> egl_image_;

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

s/egl_image/gl_image/

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

Done.

 
-  DISALLOW_COPY_AND_ASSIGN(VaapiTFPPicture);
+  DISALLOW_COPY_AND_ASSIGN(VaapiDrmPicture);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_TFP_PICTURE_H_
+#endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_DRM_PICTURE_H_