Index: content/common/gpu/media/fake_video_decode_accelerator.h |
diff --git a/content/common/gpu/media/fake_video_decode_accelerator.h b/content/common/gpu/media/fake_video_decode_accelerator.h |
index 7dcbfda2e772153da26f2f3b25b5458cb69e7b93..10d47822b45faac4a0d1bcc3c5041138751903cc 100644 |
--- a/content/common/gpu/media/fake_video_decode_accelerator.h |
+++ b/content/common/gpu/media/fake_video_decode_accelerator.h |
@@ -13,6 +13,7 @@ |
#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
#include "content/common/content_export.h" |
+#include "content/common/gpu/media/gpu_video_decode_accelerator_helpers.h" |
#include "media/video/video_decode_accelerator.h" |
#include "ui/gfx/geometry/size_f.h" |
#include "ui/gl/gl_context.h" |
@@ -23,9 +24,8 @@ class CONTENT_EXPORT FakeVideoDecodeAccelerator |
: public media::VideoDecodeAccelerator { |
public: |
FakeVideoDecodeAccelerator( |
- gfx::GLContext* gl, |
- gfx::Size size, |
- const base::Callback<bool(void)>& make_context_current); |
+ const gfx::Size& size, |
+ const MakeGLContextCurrentCallback& make_context_current_cb); |
~FakeVideoDecodeAccelerator() override; |
bool Initialize(const Config& config, Client* client) override; |
@@ -36,7 +36,10 @@ class CONTENT_EXPORT FakeVideoDecodeAccelerator |
void Flush() override; |
void Reset() override; |
void Destroy() override; |
- bool CanDecodeOnIOThread() override; |
+ bool TryToSetupDecodeOnSeparateThread( |
+ const base::WeakPtr<Client>& decode_client, |
+ const scoped_refptr<base::SingleThreadTaskRunner>& decode_task_runner) |
+ override; |
private: |
void DoPictureReady(); |
@@ -49,8 +52,7 @@ class CONTENT_EXPORT FakeVideoDecodeAccelerator |
Client* client_; |
// Make our context current before running any GL entry points. |
- base::Callback<bool(void)> make_context_current_; |
- gfx::GLContext* gl_; |
+ MakeGLContextCurrentCallback make_context_current_cb_; |
// Output picture size. |
gfx::Size frame_buffer_size_; |