content: Add support for Video Decode Acceleration on GBM

content/common/gpu/media/vaapi_video_decode_accelerator_drm.h

Index: content/common/gpu/media/vaapi_video_decode_accelerator_drm.h
diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.h b/content/common/gpu/media/vaapi_video_decode_accelerator_drm.h
similarity index 98%
copy from content/common/gpu/media/vaapi_video_decode_accelerator.h
copy to content/common/gpu/media/vaapi_video_decode_accelerator_drm.h
index 2bde3e0cef75a83e99b2166fdf772137a66460f2..a92f58c4370c84321688f4884ba405b9dd7106ae 100644
--- a/content/common/gpu/media/vaapi_video_decode_accelerator.h
+++ b/content/common/gpu/media/vaapi_video_decode_accelerator_drm.h
@@ -5,9 +5,10 @@
 // This file contains an implementation of VideoDecoderAccelerator
 // that utilizes hardware video decoder present on Intel CPUs.
 
-#ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
-#define CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
+#ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_DRM_H_
+#define CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_DRM_H_
 
+#include <list>

[scherkus (not reviewing), 2014/07/29 17:48:54]

might have missed this ... but what changed to require this new #include?

[vignatti (out of this project), 2014/07/30 21:51:30]

if I don't add this in here it complains about line 207: 
std::list<VASurfaceID> available_va_surfaces_;

but why this doesn't happen with aapi_video_decode_accelerator.h? Good question.

 #include <map>
 #include <queue>
 #include <utility>
@@ -44,7 +45,6 @@ class CONTENT_EXPORT VaapiVideoDecodeAccelerator
     : public media::VideoDecodeAccelerator {
  public:
   VaapiVideoDecodeAccelerator(

[scherkus (not reviewing), 2014/07/29 17:48:54]

needs explicit keyword

[vignatti (out of this project), 2014/07/30 21:51:30]

sorry, what? Are you asking to change all the class to
VaapiVideoDecodeAcceleratorDRM?

-      Display* x_display,
       const base::Callback<bool(void)>& make_context_current);
   virtual ~VaapiVideoDecodeAccelerator();
 
@@ -148,10 +148,8 @@ private:
   // Check if the surfaces have been released or post ourselves for later.
   void TryFinishSurfaceSetChange();
 
-  // Client-provided X/GLX state.
-  Display* x_display_;
+  int fd_;
   base::Callback<bool(void)> make_context_current_;
-  GLXFBConfig fb_config_;
 
   // VAVDA state.
   enum State {
@@ -276,4 +274,4 @@ private:
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
+#endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_DRM_H_