Index: content/common/gpu/media/vt_video_decode_accelerator_mac.h |
diff --git a/content/common/gpu/media/vt_video_decode_accelerator_mac.h b/content/common/gpu/media/vt_video_decode_accelerator_mac.h |
index c3e75e9e860b6fe2c562aa99fca9e61b6d1c4f6b..e3c0973fa6823687b15f9e00e856179d5751bc0f 100644 |
--- a/content/common/gpu/media/vt_video_decode_accelerator_mac.h |
+++ b/content/common/gpu/media/vt_video_decode_accelerator_mac.h |
@@ -17,6 +17,7 @@ |
#include "base/message_loop/message_loop.h" |
#include "base/threading/thread.h" |
#include "base/threading/thread_checker.h" |
+#include "content/common/gpu/media/gpu_video_decode_accelerator_helpers.h" |
#include "content/common/gpu/media/vt_mac.h" |
#include "media/filters/h264_parser.h" |
#include "media/video/h264_poc.h" |
@@ -35,8 +36,9 @@ bool InitializeVideoToolbox(); |
class VTVideoDecodeAccelerator : public media::VideoDecodeAccelerator { |
public: |
explicit VTVideoDecodeAccelerator( |
- const MakeContextCurrentCallback& make_context_current, |
- const BindImageCallback& bind_image); |
+ const MakeGLContextCurrentCallback& make_context_current_cb, |
+ const BindGLImageCallback& bind_image_cb); |
+ |
~VTVideoDecodeAccelerator() override; |
// VideoDecodeAccelerator implementation. |
@@ -48,7 +50,10 @@ class VTVideoDecodeAccelerator : public media::VideoDecodeAccelerator { |
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; |
// Called by OutputThunk() when VideoToolbox finishes decoding a frame. |
void Output( |
@@ -188,8 +193,9 @@ class VTVideoDecodeAccelerator : public media::VideoDecodeAccelerator { |
// |
// GPU thread state. |
// |
- MakeContextCurrentCallback make_context_current_; |
- BindImageCallback bind_image_; |
+ MakeGLContextCurrentCallback make_context_current_cb_; |
+ BindGLImageCallback bind_image_cb_; |
+ |
media::VideoDecodeAccelerator::Client* client_; |
State state_; |