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( |
(...skipping 25 matching lines...) Expand all Loading... |
45 DCHECK(!rendering_); | 46 DCHECK(!rendering_); |
46 if (client_) | 47 if (client_) |
47 client_->StopUsingProvider(); | 48 client_->StopUsingProvider(); |
48 } | 49 } |
49 | 50 |
50 void VideoFrameCompositor::OnRendererStateUpdate(bool new_state) { | 51 void VideoFrameCompositor::OnRendererStateUpdate(bool new_state) { |
51 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); | 52 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); |
52 DCHECK_NE(rendering_, new_state); | 53 DCHECK_NE(rendering_, new_state); |
53 rendering_ = new_state; | 54 rendering_ = new_state; |
54 | 55 |
| 56 if (!auto_open_close_) { |
| 57 auto_open_close_.reset(new base::trace_event::AutoOpenCloseEvent( |
| 58 base::trace_event::AutoOpenCloseEvent::Type::ASYNC, "media,rail", |
| 59 "VideoPlayback")); |
| 60 } |
| 61 |
| 62 if (rendering_) { |
| 63 auto_open_close_->Begin(); |
| 64 } else { |
| 65 auto_open_close_->End(); |
| 66 } |
| 67 |
55 if (rendering_) { | 68 if (rendering_) { |
56 // Always start playback in background rendering mode, if |client_| kicks | 69 // Always start playback in background rendering mode, if |client_| kicks |
57 // in right away it's okay. | 70 // in right away it's okay. |
58 BackgroundRender(); | 71 BackgroundRender(); |
59 } else if (background_rendering_enabled_) { | 72 } else if (background_rendering_enabled_) { |
60 background_rendering_timer_.Stop(); | 73 background_rendering_timer_.Stop(); |
61 } else { | 74 } else { |
62 DCHECK(!background_rendering_timer_.IsRunning()); | 75 DCHECK(!background_rendering_timer_.IsRunning()); |
63 } | 76 } |
64 | 77 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); | 111 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); |
99 return CallRender(deadline_min, deadline_max, false); | 112 return CallRender(deadline_min, deadline_max, false); |
100 } | 113 } |
101 | 114 |
102 bool VideoFrameCompositor::HasCurrentFrame() { | 115 bool VideoFrameCompositor::HasCurrentFrame() { |
103 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); | 116 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); |
104 return static_cast<bool>(current_frame_); | 117 return static_cast<bool>(current_frame_); |
105 } | 118 } |
106 | 119 |
107 void VideoFrameCompositor::Start(RenderCallback* callback) { | 120 void VideoFrameCompositor::Start(RenderCallback* callback) { |
108 TRACE_EVENT_ASYNC_BEGIN0("media,rail", "VideoPlayback", | |
109 static_cast<const void*>(this)); | |
110 | |
111 // Called from the media thread, so acquire the callback under lock before | 121 // 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. | 122 // returning in case a Stop() call comes in before the PostTask is processed. |
113 base::AutoLock lock(callback_lock_); | 123 base::AutoLock lock(callback_lock_); |
114 DCHECK(!callback_); | 124 DCHECK(!callback_); |
115 callback_ = callback; | 125 callback_ = callback; |
116 compositor_task_runner_->PostTask( | 126 compositor_task_runner_->PostTask( |
117 FROM_HERE, base::Bind(&VideoFrameCompositor::OnRendererStateUpdate, | 127 FROM_HERE, base::Bind(&VideoFrameCompositor::OnRendererStateUpdate, |
118 base::Unretained(this), true)); | 128 base::Unretained(this), true)); |
119 } | 129 } |
120 | 130 |
121 void VideoFrameCompositor::Stop() { | 131 void VideoFrameCompositor::Stop() { |
122 TRACE_EVENT_ASYNC_END0("media,rail", "VideoPlayback", | |
123 static_cast<const void*>(this)); | |
124 | |
125 // Called from the media thread, so release the callback under lock before | 132 // Called from the media thread, so release the callback under lock before |
126 // returning to avoid a pending UpdateCurrentFrame() call occurring before | 133 // returning to avoid a pending UpdateCurrentFrame() call occurring before |
127 // the PostTask is processed. | 134 // the PostTask is processed. |
128 base::AutoLock lock(callback_lock_); | 135 base::AutoLock lock(callback_lock_); |
129 DCHECK(callback_); | 136 DCHECK(callback_); |
130 callback_ = nullptr; | 137 callback_ = nullptr; |
131 compositor_task_runner_->PostTask( | 138 compositor_task_runner_->PostTask( |
132 FROM_HERE, base::Bind(&VideoFrameCompositor::OnRendererStateUpdate, | 139 FROM_HERE, base::Bind(&VideoFrameCompositor::OnRendererStateUpdate, |
133 base::Unretained(this), false)); | 140 base::Unretained(this), false)); |
134 } | 141 } |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 last_interval_ = deadline_max - deadline_min; | 248 last_interval_ = deadline_max - deadline_min; |
242 | 249 |
243 // Restart the background rendering timer whether we're background rendering | 250 // Restart the background rendering timer whether we're background rendering |
244 // or not; in either case we should wait for |kBackgroundRenderingTimeoutMs|. | 251 // or not; in either case we should wait for |kBackgroundRenderingTimeoutMs|. |
245 if (background_rendering_enabled_) | 252 if (background_rendering_enabled_) |
246 background_rendering_timer_.Reset(); | 253 background_rendering_timer_.Reset(); |
247 return new_frame || had_new_background_frame; | 254 return new_frame || had_new_background_frame; |
248 } | 255 } |
249 | 256 |
250 } // namespace media | 257 } // namespace media |
OLD | NEW |