Chromium Code Reviews| Index: content/common/gpu/media/fake_video_decode_accelerator.cc |
| diff --git a/content/common/gpu/media/fake_video_decode_accelerator.cc b/content/common/gpu/media/fake_video_decode_accelerator.cc |
| index 230c4f34c86e48bbf2f73e852a7297cc4ae6c3af..66255d8f7b9e3e0d8f9978bdf469ce27c7b8ef18 100644 |
| --- a/content/common/gpu/media/fake_video_decode_accelerator.cc |
| +++ b/content/common/gpu/media/fake_video_decode_accelerator.cc |
| @@ -29,17 +29,14 @@ static const unsigned int kNumBuffers = media::limits::kMaxVideoFrames + |
| (media::limits::kMaxVideoFrames & 1u); |
| FakeVideoDecodeAccelerator::FakeVideoDecodeAccelerator( |
| - gfx::GLContext* gl, |
| - gfx::Size size, |
| - const base::Callback<bool(void)>& make_context_current) |
| + const gfx::Size& size, |
| + const gpu_vda_helpers::MakeGLContextCurrentCb& make_context_current_cb) |
| : child_task_runner_(base::ThreadTaskRunnerHandle::Get()), |
| client_(NULL), |
| - make_context_current_(make_context_current), |
| - gl_(gl), |
| + make_context_current_cb_(make_context_current_cb), |
| frame_buffer_size_(size), |
| flushing_(false), |
| - weak_this_factory_(this) { |
| -} |
| + weak_this_factory_(this) {} |
| FakeVideoDecodeAccelerator::~FakeVideoDecodeAccelerator() { |
| } |
| @@ -103,7 +100,7 @@ void FakeVideoDecodeAccelerator::AssignPictureBuffers( |
| memset(black_data.get(), |
| 0, |
| frame_buffer_size_.width() * frame_buffer_size_.height() * 4); |
| - if (!make_context_current_.Run()) { |
| + if (!make_context_current_cb_.Run()) { |
| LOG(ERROR) << "ReusePictureBuffer(): could not make context current"; |
| return; |
| } |
| @@ -162,8 +159,10 @@ void FakeVideoDecodeAccelerator::Destroy() { |
| delete this; |
| } |
| -bool FakeVideoDecodeAccelerator::CanDecodeOnIOThread() { |
| - return true; |
| +bool FakeVideoDecodeAccelerator::TryInitializeDecodeOnSeparateThread( |
| + const base::WeakPtr<Client>& decode_client, |
| + const scoped_refptr<base::SingleThreadTaskRunner>& decode_task_runner) { |
| + return false; |
|
kcwu
2016/03/02 09:00:12
FakeVideoDecodeAccelerator::CanDecodeOnIOThread()
Pawel Osciak
2016/03/02 10:16:49
Yes. This class wasn't accepting an additional cli
|
| } |
| void FakeVideoDecodeAccelerator::DoPictureReady() { |