| Index: content/common/gpu/media/vaapi_video_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.h b/content/common/gpu/media/vaapi_video_decode_accelerator.h
|
| index 2bde3e0cef75a83e99b2166fdf772137a66460f2..77f8e0e70ff59da9418cc60fd488fe24440f5343 100644
|
| --- a/content/common/gpu/media/vaapi_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/vaapi_video_decode_accelerator.h
|
| @@ -8,6 +8,7 @@
|
| #ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
|
| #define CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_DECODE_ACCELERATOR_H_
|
|
|
| +#include <list>
|
| #include <map>
|
| #include <queue>
|
| #include <utility>
|
| @@ -44,7 +45,9 @@ class CONTENT_EXPORT VaapiVideoDecodeAccelerator
|
| : public media::VideoDecodeAccelerator {
|
| public:
|
| VaapiVideoDecodeAccelerator(
|
| +#if defined(USE_X11)
|
| Display* x_display,
|
| +#endif
|
| const base::Callback<bool(void)>& make_context_current);
|
| virtual ~VaapiVideoDecodeAccelerator();
|
|
|
| @@ -148,10 +151,14 @@ private:
|
| // Check if the surfaces have been released or post ourselves for later.
|
| void TryFinishSurfaceSetChange();
|
|
|
| +#if defined(USE_X11)
|
| // Client-provided X/GLX state.
|
| Display* x_display_;
|
| - base::Callback<bool(void)> make_context_current_;
|
| GLXFBConfig fb_config_;
|
| +#else
|
| + int fd_;
|
| +#endif
|
| + base::Callback<bool(void)> make_context_current_;
|
|
|
| // VAVDA state.
|
| enum State {
|
|
|