Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Side by Side Diff: media/blink/video_frame_compositor.cc

Issue 2159323002: Add tracing AutoOpenCloseEvent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/trace_event.h" 10 #include "base/trace_event/trace_event.h"
11 #include "base/trace_event/trace_event_impl.h"
12 #include "base/trace_event/trace_log.h"
11 #include "media/base/video_frame.h" 13 #include "media/base/video_frame.h"
14 #include "base/trace_event/vfc_persistent_async_event.h"
15
16
17 #include <sstream>
18 #include <string>
12 19
13 namespace media { 20 namespace media {
14 21
15 // Amount of time to wait between UpdateCurrentFrame() callbacks before starting 22 // Amount of time to wait between UpdateCurrentFrame() callbacks before starting
16 // background rendering to keep the Render() callbacks moving. 23 // background rendering to keep the Render() callbacks moving.
17 const int kBackgroundRenderingTimeoutMs = 250; 24 const int kBackgroundRenderingTimeoutMs = 250;
18 25
19 VideoFrameCompositor::VideoFrameCompositor( 26 VideoFrameCompositor::VideoFrameCompositor(
20 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner) 27 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner)
21 : compositor_task_runner_(compositor_task_runner), 28 : compositor_task_runner_(compositor_task_runner),
22 tick_clock_(new base::DefaultTickClock()), 29 tick_clock_(new base::DefaultTickClock()),
23 background_rendering_enabled_(true), 30 background_rendering_enabled_(true),
24 background_rendering_timer_( 31 background_rendering_timer_(
25 FROM_HERE, 32 FROM_HERE,
26 base::TimeDelta::FromMilliseconds(kBackgroundRenderingTimeoutMs), 33 base::TimeDelta::FromMilliseconds(kBackgroundRenderingTimeoutMs),
27 base::Bind(&VideoFrameCompositor::BackgroundRender, 34 base::Bind(&VideoFrameCompositor::BackgroundRender,
28 base::Unretained(this)), 35 base::Unretained(this)),
29 // Task is not repeating, CallRender() will reset the task as needed. 36 // Task is not repeating, CallRender() will reset the task as needed.
30 false), 37 false),
31 client_(nullptr), 38 client_(nullptr),
32 rendering_(false), 39 rendering_(false),
33 rendered_last_frame_(false), 40 rendered_last_frame_(false),
34 is_background_rendering_(false), 41 is_background_rendering_(false),
35 new_background_frame_(false), 42 new_background_frame_(false),
36 // Assume 60Hz before the first UpdateCurrentFrame() call. 43 // Assume 60Hz before the first UpdateCurrentFrame() call.
37 last_interval_(base::TimeDelta::FromSecondsD(1.0 / 60)), 44 last_interval_(base::TimeDelta::FromSecondsD(1.0 / 60)),
38 callback_(nullptr) { 45 callback_(nullptr) {
39 background_rendering_timer_.SetTaskRunner(compositor_task_runner_); 46 background_rendering_timer_.SetTaskRunner(compositor_task_runner_);
47 const void* this_address = static_cast<const void*>(this);
48 std::stringstream s;
benjhayden 2016/08/10 18:30:00 Chrome has a handy StringPrintf library, but Persi
49 s << this_address;
50 video_id_ = s.str();
51 persistent_async_ = new base::trace_event::VFCPersistentAsyncEvent();
52 base::trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(persistent _async_);
40 } 53 }
41 54
42 VideoFrameCompositor::~VideoFrameCompositor() { 55 VideoFrameCompositor::~VideoFrameCompositor() {
43 DCHECK(compositor_task_runner_->BelongsToCurrentThread()); 56 DCHECK(compositor_task_runner_->BelongsToCurrentThread());
44 DCHECK(!callback_); 57 DCHECK(!callback_);
45 DCHECK(!rendering_); 58 DCHECK(!rendering_);
46 if (client_) 59 if (client_)
47 client_->StopUsingProvider(); 60 client_->StopUsingProvider();
48 } 61 }
49 62
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_EVENT0("media", "VideoFrameCompositor::Start"); 121 persistent_async_->Start(video_id_);
109 122
110 // Called from the media thread, so acquire the callback under lock before 123 // Called from the media thread, so acquire the callback under lock before
111 // returning in case a Stop() call comes in before the PostTask is processed. 124 // returning in case a Stop() call comes in before the PostTask is processed.
112 base::AutoLock lock(callback_lock_); 125 base::AutoLock lock(callback_lock_);
113 DCHECK(!callback_); 126 DCHECK(!callback_);
114 callback_ = callback; 127 callback_ = callback;
115 compositor_task_runner_->PostTask( 128 compositor_task_runner_->PostTask(
116 FROM_HERE, base::Bind(&VideoFrameCompositor::OnRendererStateUpdate, 129 FROM_HERE, base::Bind(&VideoFrameCompositor::OnRendererStateUpdate,
117 base::Unretained(this), true)); 130 base::Unretained(this), true));
118 } 131 }
119 132
120 void VideoFrameCompositor::Stop() { 133 void VideoFrameCompositor::Stop() {
121 TRACE_EVENT0("media", "VideoFrameCompositor::Stop"); 134 persistent_async_->Stop(video_id_);
122 135
123 // Called from the media thread, so release the callback under lock before 136 // Called from the media thread, so release the callback under lock before
124 // returning to avoid a pending UpdateCurrentFrame() call occurring before 137 // returning to avoid a pending UpdateCurrentFrame() call occurring before
125 // the PostTask is processed. 138 // the PostTask is processed.
126 base::AutoLock lock(callback_lock_); 139 base::AutoLock lock(callback_lock_);
127 DCHECK(callback_); 140 DCHECK(callback_);
128 callback_ = nullptr; 141 callback_ = nullptr;
129 compositor_task_runner_->PostTask( 142 compositor_task_runner_->PostTask(
130 FROM_HERE, base::Bind(&VideoFrameCompositor::OnRendererStateUpdate, 143 FROM_HERE, base::Bind(&VideoFrameCompositor::OnRendererStateUpdate,
131 base::Unretained(this), false)); 144 base::Unretained(this), false));
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 last_interval_ = deadline_max - deadline_min; 248 last_interval_ = deadline_max - deadline_min;
236 249
237 // Restart the background rendering timer whether we're background rendering 250 // Restart the background rendering timer whether we're background rendering
238 // or not; in either case we should wait for |kBackgroundRenderingTimeoutMs|. 251 // or not; in either case we should wait for |kBackgroundRenderingTimeoutMs|.
239 if (background_rendering_enabled_) 252 if (background_rendering_enabled_)
240 background_rendering_timer_.Reset(); 253 background_rendering_timer_.Reset();
241 return new_frame || had_new_background_frame; 254 return new_frame || had_new_background_frame;
242 } 255 }
243 256
244 } // namespace media 257 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698