Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/blink/video_frame_compositor.h" | 5 #include "media/blink/video_frame_compositor.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/time/default_tick_clock.h" | 9 #include "base/time/default_tick_clock.h" |
| 10 #include "base/trace_event/auto_open_close_event.h" | |
| 10 #include "base/trace_event/trace_event.h" | 11 #include "base/trace_event/trace_event.h" |
| 11 #include "media/base/video_frame.h" | 12 #include "media/base/video_frame.h" |
| 12 | 13 |
| 13 namespace media { | 14 namespace media { |
| 14 | 15 |
| 15 // Amount of time to wait between UpdateCurrentFrame() callbacks before starting | 16 // Amount of time to wait between UpdateCurrentFrame() callbacks before starting |
| 16 // background rendering to keep the Render() callbacks moving. | 17 // background rendering to keep the Render() callbacks moving. |
| 17 const int kBackgroundRenderingTimeoutMs = 250; | 18 const int kBackgroundRenderingTimeoutMs = 250; |
| 18 | 19 |
| 19 VideoFrameCompositor::VideoFrameCompositor( | 20 VideoFrameCompositor::VideoFrameCompositor( |
| 20 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner) | 21 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner) |
| 21 : compositor_task_runner_(compositor_task_runner), | 22 : compositor_task_runner_(compositor_task_runner), |
| 22 tick_clock_(new base::DefaultTickClock()), | 23 tick_clock_(new base::DefaultTickClock()), |
| 23 background_rendering_enabled_(true), | 24 background_rendering_enabled_(true), |
| 24 background_rendering_timer_( | 25 background_rendering_timer_( |
| 25 FROM_HERE, | 26 FROM_HERE, |
| 26 base::TimeDelta::FromMilliseconds(kBackgroundRenderingTimeoutMs), | 27 base::TimeDelta::FromMilliseconds(kBackgroundRenderingTimeoutMs), |
| 27 base::Bind(&VideoFrameCompositor::BackgroundRender, | 28 base::Bind(&VideoFrameCompositor::BackgroundRender, |
| 28 base::Unretained(this)), | 29 base::Unretained(this)), |
| 29 // Task is not repeating, CallRender() will reset the task as needed. | 30 // Task is not repeating, CallRender() will reset the task as needed. |
| 30 false), | 31 false), |
| 31 client_(nullptr), | 32 client_(nullptr), |
| 32 rendering_(false), | 33 rendering_(false), |
| 33 rendered_last_frame_(false), | 34 rendered_last_frame_(false), |
| 34 is_background_rendering_(false), | 35 is_background_rendering_(false), |
| 35 new_background_frame_(false), | 36 new_background_frame_(false), |
| 36 // Assume 60Hz before the first UpdateCurrentFrame() call. | 37 // Assume 60Hz before the first UpdateCurrentFrame() call. |
| 37 last_interval_(base::TimeDelta::FromSecondsD(1.0 / 60)), | 38 last_interval_(base::TimeDelta::FromSecondsD(1.0 / 60)), |
| 38 callback_(nullptr) { | 39 callback_(nullptr), |
| 40 auto_open_close_(nullptr) { | |
| 39 background_rendering_timer_.SetTaskRunner(compositor_task_runner_); | 41 background_rendering_timer_.SetTaskRunner(compositor_task_runner_); |
| 42 constructor_task_runner_ = base::ThreadTaskRunnerHandle::Get(); | |
| 43 auto_open_close_ = new base::trace_event::AutoOpenCloseEvent( | |
|
Primiano Tucci (use gerrit)
2016/10/12 16:36:50
raw pointers with manual new/delete are discourage
alexandermont
2016/10/13 19:15:53
Changed to unique ptr
| |
| 44 base::trace_event::AutoOpenCloseEvent::Type::ASYNC, "media,rail", | |
| 45 "VideoPlayback"); | |
| 40 } | 46 } |
| 41 | 47 |
| 42 VideoFrameCompositor::~VideoFrameCompositor() { | 48 VideoFrameCompositor::~VideoFrameCompositor() { |
| 43 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); | 49 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); |
| 44 DCHECK(!callback_); | 50 DCHECK(!callback_); |
| 45 DCHECK(!rendering_); | 51 DCHECK(!rendering_); |
| 52 if (auto_open_close_) | |
| 53 delete auto_open_close_; | |
|
benjhayden
2016/10/12 03:05:54
This will only work if VFC is created on the compo
Primiano Tucci (use gerrit)
2016/10/12 16:36:50
this should be just a auto_open_close.reset()
| |
| 46 if (client_) | 54 if (client_) |
| 47 client_->StopUsingProvider(); | 55 client_->StopUsingProvider(); |
| 48 } | 56 } |
| 49 | 57 |
| 50 void VideoFrameCompositor::OnRendererStateUpdate(bool new_state) { | 58 void VideoFrameCompositor::OnRendererStateUpdate(bool new_state) { |
| 51 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); | 59 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); |
| 52 DCHECK_NE(rendering_, new_state); | 60 DCHECK_NE(rendering_, new_state); |
| 53 rendering_ = new_state; | 61 rendering_ = new_state; |
| 54 | 62 |
|
benjhayden
2016/10/12 20:41:10
if aoce doesn't exist, aoce_ = new AOCE();
if rend
| |
| 55 if (rendering_) { | 63 if (rendering_) { |
| 56 // Always start playback in background rendering mode, if |client_| kicks | 64 // Always start playback in background rendering mode, if |client_| kicks |
| 57 // in right away it's okay. | 65 // in right away it's okay. |
| 58 BackgroundRender(); | 66 BackgroundRender(); |
| 59 } else if (background_rendering_enabled_) { | 67 } else if (background_rendering_enabled_) { |
| 60 background_rendering_timer_.Stop(); | 68 background_rendering_timer_.Stop(); |
| 61 } else { | 69 } else { |
| 62 DCHECK(!background_rendering_timer_.IsRunning()); | 70 DCHECK(!background_rendering_timer_.IsRunning()); |
| 63 } | 71 } |
| 64 | 72 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 98 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); | 106 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); |
| 99 return CallRender(deadline_min, deadline_max, false); | 107 return CallRender(deadline_min, deadline_max, false); |
| 100 } | 108 } |
| 101 | 109 |
| 102 bool VideoFrameCompositor::HasCurrentFrame() { | 110 bool VideoFrameCompositor::HasCurrentFrame() { |
| 103 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); | 111 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); |
| 104 return static_cast<bool>(current_frame_); | 112 return static_cast<bool>(current_frame_); |
| 105 } | 113 } |
| 106 | 114 |
| 107 void VideoFrameCompositor::Start(RenderCallback* callback) { | 115 void VideoFrameCompositor::Start(RenderCallback* callback) { |
| 108 TRACE_EVENT_ASYNC_BEGIN0("media,rail", "VideoPlayback", | 116 constructor_task_runner_->PostTask( |
| 109 static_cast<const void*>(this)); | 117 FROM_HERE, base::Bind(&base::trace_event::AutoOpenCloseEvent::Begin, |
| 118 base::Unretained(auto_open_close_))); | |
| 110 | 119 |
| 111 // Called from the media thread, so acquire the callback under lock before | 120 // Called from the media thread, so acquire the callback under lock before |
| 112 // returning in case a Stop() call comes in before the PostTask is processed. | 121 // returning in case a Stop() call comes in before the PostTask is processed. |
| 113 base::AutoLock lock(callback_lock_); | 122 base::AutoLock lock(callback_lock_); |
| 114 DCHECK(!callback_); | 123 DCHECK(!callback_); |
| 115 callback_ = callback; | 124 callback_ = callback; |
| 116 compositor_task_runner_->PostTask( | 125 compositor_task_runner_->PostTask( |
| 117 FROM_HERE, base::Bind(&VideoFrameCompositor::OnRendererStateUpdate, | 126 FROM_HERE, base::Bind(&VideoFrameCompositor::OnRendererStateUpdate, |
| 118 base::Unretained(this), true)); | 127 base::Unretained(this), true)); |
| 119 } | 128 } |
| 120 | 129 |
| 121 void VideoFrameCompositor::Stop() { | 130 void VideoFrameCompositor::Stop() { |
| 122 TRACE_EVENT_ASYNC_END0("media,rail", "VideoPlayback", | 131 constructor_task_runner_->PostTask( |
| 123 static_cast<const void*>(this)); | 132 FROM_HERE, base::Bind(&base::trace_event::AutoOpenCloseEvent::End, |
| 133 base::Unretained(auto_open_close_))); | |
| 124 | 134 |
| 125 // Called from the media thread, so release the callback under lock before | 135 // Called from the media thread, so release the callback under lock before |
| 126 // returning to avoid a pending UpdateCurrentFrame() call occurring before | 136 // returning to avoid a pending UpdateCurrentFrame() call occurring before |
| 127 // the PostTask is processed. | 137 // the PostTask is processed. |
| 128 base::AutoLock lock(callback_lock_); | 138 base::AutoLock lock(callback_lock_); |
| 129 DCHECK(callback_); | 139 DCHECK(callback_); |
| 130 callback_ = nullptr; | 140 callback_ = nullptr; |
| 131 compositor_task_runner_->PostTask( | 141 compositor_task_runner_->PostTask( |
| 132 FROM_HERE, base::Bind(&VideoFrameCompositor::OnRendererStateUpdate, | 142 FROM_HERE, base::Bind(&VideoFrameCompositor::OnRendererStateUpdate, |
| 133 base::Unretained(this), false)); | 143 base::Unretained(this), false)); |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 241 last_interval_ = deadline_max - deadline_min; | 251 last_interval_ = deadline_max - deadline_min; |
| 242 | 252 |
| 243 // Restart the background rendering timer whether we're background rendering | 253 // Restart the background rendering timer whether we're background rendering |
| 244 // or not; in either case we should wait for |kBackgroundRenderingTimeoutMs|. | 254 // or not; in either case we should wait for |kBackgroundRenderingTimeoutMs|. |
| 245 if (background_rendering_enabled_) | 255 if (background_rendering_enabled_) |
| 246 background_rendering_timer_.Reset(); | 256 background_rendering_timer_.Reset(); |
| 247 return new_frame || had_new_background_frame; | 257 return new_frame || had_new_background_frame; |
| 248 } | 258 } |
| 249 | 259 |
| 250 } // namespace media | 260 } // namespace media |
| OLD | NEW |