Update To 11.40.268.0
[platform/framework/web/crosswalk.git] / src / ozone / media / vaapi_video_decode_accelerator.h
index cc3cea8..fd8a530 100644 (file)
@@ -27,7 +27,6 @@
 #include "media/base/bitstream_buffer.h"
 #include "media/video/picture.h"
 #include "media/video/video_decode_accelerator.h"
-#include "ui/gl/gl_bindings.h"
 #include "vaapi_h264_decoder.h"
 #include "vaapi_wrapper.h"
 
@@ -46,19 +45,19 @@ class VaapiVideoDecodeAccelerator
  public:
   VaapiVideoDecodeAccelerator(
       const base::Callback<bool(void)>& make_context_current); //NOLINT
-  virtual ~VaapiVideoDecodeAccelerator();
+  virtual  ~VaapiVideoDecodeAccelerator();
 
   // media::VideoDecodeAccelerator implementation.
-  virtual bool Initialize(media::VideoCodecProfile profile,
-                          Client* client) OVERRIDE;
-  virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) OVERRIDE;
-  virtual void AssignPictureBuffers(
-      const std::vector<media::PictureBuffer>& buffers) OVERRIDE;
-  virtual void ReusePictureBuffer(int32 picture_buffer_id) OVERRIDE;
-  virtual void Flush() OVERRIDE;
-  virtual void Reset() OVERRIDE;
-  virtual void Destroy() OVERRIDE;
-  virtual bool CanDecodeOnIOThread() OVERRIDE;
+   bool Initialize(media::VideoCodecProfile profile,
+                          Client* client) override;
+   void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
+   void AssignPictureBuffers(
+      const std::vector<media::PictureBuffer>& buffers) override;
+   void ReusePictureBuffer(int32 picture_buffer_id) override;
+   void Flush() override;
+   void Reset() override;
+   void Destroy() override;
+   bool CanDecodeOnIOThread() override;
 
 private:
   // Notify the client that an error has occurred and decoding cannot continue.