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

Side by Side Diff: content/renderer/media/renderer_webmediaplayer_delegate.cc

Issue 2490783002: Refactor WebMediaPlayerDelegate interface. (Closed)
Patch Set: Unit tests found a real bug! Created 3 years, 11 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "content/renderer/media/renderer_webmediaplayer_delegate.h" 5 #include "content/renderer/media/renderer_webmediaplayer_delegate.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 14 matching lines...) Expand all
25 content::RenderThread::Get()->RecordAction(action); 25 content::RenderThread::Get()->RecordAction(action);
26 } 26 }
27 27
28 } // namespace 28 } // namespace
29 29
30 namespace media { 30 namespace media {
31 31
32 RendererWebMediaPlayerDelegate::RendererWebMediaPlayerDelegate( 32 RendererWebMediaPlayerDelegate::RendererWebMediaPlayerDelegate(
33 content::RenderFrame* render_frame) 33 content::RenderFrame* render_frame)
34 : RenderFrameObserver(render_frame), 34 : RenderFrameObserver(render_frame),
35 idle_cleanup_timer_(true, true),
36 default_tick_clock_(new base::DefaultTickClock()), 35 default_tick_clock_(new base::DefaultTickClock()),
37 tick_clock_(default_tick_clock_.get()) { 36 tick_clock_(default_tick_clock_.get()) {
38 idle_cleanup_interval_ = base::TimeDelta::FromSeconds(5); 37 idle_cleanup_interval_ = base::TimeDelta::FromSeconds(5);
39 idle_timeout_ = base::TimeDelta::FromSeconds(15); 38 idle_timeout_ = base::TimeDelta::FromSeconds(15);
40 39
41 // To conserve resources, cleanup idle players more often on low end devices. 40 // Idle players time out more aggressively on low end devices.
42 is_low_end_device_ = base::SysInfo::IsLowEndDevice(); 41 is_low_end_device_ = base::SysInfo::IsLowEndDevice();
43 42
44 #if defined(OS_ANDROID) 43 #if defined(OS_ANDROID)
45 // On Android, due to the instability of the OS level media components, we 44 // On Android, due to the instability of the OS level media components, we
46 // consider all pre-KitKat devices to be low end. 45 // consider all pre-KitKat devices to be low end.
47 is_low_end_device_ |= 46 is_low_end_device_ |=
48 base::android::BuildInfo::GetInstance()->sdk_int() <= 18; 47 base::android::BuildInfo::GetInstance()->sdk_int() <= 18;
49 #endif 48 #endif
50 } 49 }
51 50
52 RendererWebMediaPlayerDelegate::~RendererWebMediaPlayerDelegate() {} 51 RendererWebMediaPlayerDelegate::~RendererWebMediaPlayerDelegate() {}
53 52
54 int RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) { 53 bool RendererWebMediaPlayerDelegate::IsFrameHidden() {
55 const int delegate_id = id_map_.Add(observer); 54 if (is_frame_hidden_for_testing_)
56 // Start players in the idle state to ensure we capture players which are 55 return true;
57 // consuming resources, but which have never played. 56
58 AddIdleDelegate(delegate_id); 57 return (render_frame() && render_frame()->IsHidden()) || is_frame_closed_;
59 return delegate_id;
60 } 58 }
61 59
62 void RendererWebMediaPlayerDelegate::RemoveObserver(int delegate_id) { 60 bool RendererWebMediaPlayerDelegate::IsFrameClosed() {
63 DCHECK(id_map_.Lookup(delegate_id)); 61 return is_frame_closed_;
64 id_map_.Remove(delegate_id); 62 }
65 RemoveIdleDelegate(delegate_id); 63
66 playing_videos_.erase(delegate_id); 64 bool RendererWebMediaPlayerDelegate::IsBackgroundVideoPlaybackUnlocked() {
65 // TODO(sandersd): Include a check for kResumeBackgroundVideo?
66 return background_video_allowed_;
67 }
68
69 int RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) {
70 return id_map_.Add(observer);
71 }
72
73 void RendererWebMediaPlayerDelegate::RemoveObserver(int player_id) {
74 DCHECK(id_map_.Lookup(player_id));
75 id_map_.Remove(player_id);
76 idle_player_map_.erase(player_id);
77 stale_players_.erase(player_id);
78 playing_videos_.erase(player_id);
79
80 Send(
81 new MediaPlayerDelegateHostMsg_OnMediaDestroyed(routing_id(), player_id));
82
83 ScheduleUpdateTask();
67 } 84 }
68 85
69 void RendererWebMediaPlayerDelegate::DidPlay( 86 void RendererWebMediaPlayerDelegate::DidPlay(
70 int delegate_id, 87 int player_id,
71 bool has_video, 88 bool has_video,
72 bool has_audio, 89 bool has_audio,
73 bool is_remote,
74 MediaContentType media_content_type) { 90 MediaContentType media_content_type) {
75 DCHECK(id_map_.Lookup(delegate_id)); 91 DVLOG(2) << __func__ << "(" << player_id << ", " << has_video << ", "
92 << has_audio << ", " << static_cast<int>(media_content_type) << ")";
93 DCHECK(id_map_.Lookup(player_id));
94
76 has_played_media_ = true; 95 has_played_media_ = true;
77 if (has_video && !is_remote) 96 if (has_video) {
78 playing_videos_.insert(delegate_id); 97 if (!playing_videos_.count(player_id)) {
79 else 98 playing_videos_.insert(player_id);
80 playing_videos_.erase(delegate_id); 99 has_played_video_ = true;
81 RemoveIdleDelegate(delegate_id); 100 }
82 101 } else {
83 // Upon receipt of a playback request, suspend everything that's not used. 102 playing_videos_.erase(player_id);
84 if (is_low_end_device_) 103 }
85 CleanupIdleDelegates(base::TimeDelta());
86 104
87 Send(new MediaPlayerDelegateHostMsg_OnMediaPlaying( 105 Send(new MediaPlayerDelegateHostMsg_OnMediaPlaying(
88 routing_id(), delegate_id, has_video, has_audio, is_remote, 106 routing_id(), player_id, has_video, has_audio, false,
89 media_content_type)); 107 media_content_type));
108
109 ScheduleUpdateTask();
90 } 110 }
91 111
92 void RendererWebMediaPlayerDelegate::DidPause(int delegate_id, 112 void RendererWebMediaPlayerDelegate::DidPause(int player_id) {
93 bool reached_end_of_stream) { 113 DVLOG(2) << __func__ << "(" << player_id << ")";
94 DCHECK(id_map_.Lookup(delegate_id)); 114 DCHECK(id_map_.Lookup(player_id));
95 AddIdleDelegate(delegate_id); 115 playing_videos_.erase(player_id);
96 if (reached_end_of_stream) 116 Send(new MediaPlayerDelegateHostMsg_OnMediaPaused(routing_id(), player_id,
97 playing_videos_.erase(delegate_id); 117 false));
98 Send(new MediaPlayerDelegateHostMsg_OnMediaPaused(routing_id(), delegate_id, 118
99 reached_end_of_stream)); 119 // Required to keep background playback statistics up to date.
120 ScheduleUpdateTask();
100 } 121 }
101 122
102 void RendererWebMediaPlayerDelegate::PlayerGone(int delegate_id) { 123 void RendererWebMediaPlayerDelegate::PlayerGone(int player_id) {
103 DCHECK(id_map_.Lookup(delegate_id)); 124 DVLOG(2) << __func__ << "(" << player_id << ")";
104 playing_videos_.erase(delegate_id); 125 DCHECK(id_map_.Lookup(player_id));
105 Send(new MediaPlayerDelegateHostMsg_OnMediaDestroyed(routing_id(), 126 playing_videos_.erase(player_id);
106 delegate_id)); 127 Send(
128 new MediaPlayerDelegateHostMsg_OnMediaDestroyed(routing_id(), player_id));
129
130 // Required to keep background playback statistics up to date.
131 ScheduleUpdateTask();
107 } 132 }
108 133
109 bool RendererWebMediaPlayerDelegate::IsHidden() { 134 void RendererWebMediaPlayerDelegate::SetIdle(int player_id, bool is_idle) {
110 return render_frame()->IsHidden(); 135 DVLOG(2) << __func__ << "(" << player_id << ", " << is_idle << ")";
136
137 if (is_idle == IsIdle(player_id))
138 return;
139
140 if (is_idle) {
141 idle_player_map_[player_id] = tick_clock_->NowTicks();
142 } else {
143 idle_player_map_.erase(player_id);
144 stale_players_.erase(player_id);
145 }
146
147 ScheduleUpdateTask();
111 } 148 }
112 149
113 bool RendererWebMediaPlayerDelegate::IsPlayingBackgroundVideo() { 150 bool RendererWebMediaPlayerDelegate::IsIdle(int player_id) {
114 return is_playing_background_video_; 151 return idle_player_map_.count(player_id) || stale_players_.count(player_id);
152 }
153
154 void RendererWebMediaPlayerDelegate::ClearStaleFlag(int player_id) {
155 DVLOG(2) << __func__ << "(" << player_id << ")";
156
157 if (!stale_players_.erase(player_id))
158 return;
159
160 // Set the idle time such that the player will be considered stale the next
161 // time idle cleanup runs.
162 idle_player_map_[player_id] = tick_clock_->NowTicks() - idle_timeout_;
163
164 ScheduleUpdateTask();
165 }
166
167 bool RendererWebMediaPlayerDelegate::IsStale(int player_id) {
168 return stale_players_.count(player_id);
115 } 169 }
116 170
117 void RendererWebMediaPlayerDelegate::WasHidden() { 171 void RendererWebMediaPlayerDelegate::WasHidden() {
172 RecordAction(base::UserMetricsAction("Media.Hidden"));
173
118 for (IDMap<Observer*>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance()) 174 for (IDMap<Observer*>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance())
119 it.GetCurrentValue()->OnHidden(); 175 it.GetCurrentValue()->OnFrameHidden();
120 176
121 RecordAction(base::UserMetricsAction("Media.Hidden")); 177 ScheduleUpdateTask();
122 } 178 }
123 179
124 void RendererWebMediaPlayerDelegate::WasShown() { 180 void RendererWebMediaPlayerDelegate::WasShown() {
125 SetIsPlayingBackgroundVideo(false); 181 RecordAction(base::UserMetricsAction("Media.Shown"));
182 is_frame_closed_ = false;
183 background_video_allowed_ = false;
184
126 for (IDMap<Observer*>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance()) 185 for (IDMap<Observer*>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance())
127 it.GetCurrentValue()->OnShown(); 186 it.GetCurrentValue()->OnFrameShown();
128 187
129 RecordAction(base::UserMetricsAction("Media.Shown")); 188 ScheduleUpdateTask();
130 } 189 }
131 190
132 bool RendererWebMediaPlayerDelegate::OnMessageReceived( 191 bool RendererWebMediaPlayerDelegate::OnMessageReceived(
133 const IPC::Message& msg) { 192 const IPC::Message& msg) {
134 bool handled = true;
135 IPC_BEGIN_MESSAGE_MAP(RendererWebMediaPlayerDelegate, msg) 193 IPC_BEGIN_MESSAGE_MAP(RendererWebMediaPlayerDelegate, msg)
136 IPC_MESSAGE_HANDLER(MediaPlayerDelegateMsg_Pause, OnMediaDelegatePause) 194 IPC_MESSAGE_HANDLER(MediaPlayerDelegateMsg_Pause, OnMediaDelegatePause)
137 IPC_MESSAGE_HANDLER(MediaPlayerDelegateMsg_Play, OnMediaDelegatePlay) 195 IPC_MESSAGE_HANDLER(MediaPlayerDelegateMsg_Play, OnMediaDelegatePlay)
138 IPC_MESSAGE_HANDLER(MediaPlayerDelegateMsg_SuspendAllMediaPlayers, 196 IPC_MESSAGE_HANDLER(MediaPlayerDelegateMsg_SuspendAllMediaPlayers,
139 OnMediaDelegateSuspendAllMediaPlayers) 197 OnMediaDelegateSuspendAllMediaPlayers)
140 IPC_MESSAGE_HANDLER(MediaPlayerDelegateMsg_UpdateVolumeMultiplier, 198 IPC_MESSAGE_HANDLER(MediaPlayerDelegateMsg_UpdateVolumeMultiplier,
141 OnMediaDelegateVolumeMultiplierUpdate) 199 OnMediaDelegateVolumeMultiplierUpdate)
142 IPC_MESSAGE_UNHANDLED(handled = false) 200 IPC_MESSAGE_UNHANDLED(return false)
143 IPC_END_MESSAGE_MAP() 201 IPC_END_MESSAGE_MAP()
144 return handled; 202 return true;
145 } 203 }
146 204
147 void RendererWebMediaPlayerDelegate::SetIdleCleanupParamsForTesting( 205 void RendererWebMediaPlayerDelegate::SetIdleCleanupParamsForTesting(
148 base::TimeDelta idle_timeout, 206 base::TimeDelta idle_timeout,
149 base::TickClock* tick_clock, 207 base::TickClock* tick_clock,
150 bool is_low_end_device) { 208 bool is_low_end_device) {
151 idle_cleanup_interval_ = base::TimeDelta(); 209 idle_cleanup_interval_ = base::TimeDelta();
152 idle_timeout_ = idle_timeout; 210 idle_timeout_ = idle_timeout;
153 tick_clock_ = tick_clock; 211 tick_clock_ = tick_clock;
154 is_low_end_device_ = is_low_end_device; 212 is_low_end_device_ = is_low_end_device;
155 } 213 }
156 214
157 void RendererWebMediaPlayerDelegate::OnMediaDelegatePause(int delegate_id) { 215 bool RendererWebMediaPlayerDelegate::IsIdleCleanupTimerRunningForTesting()
158 Observer* observer = id_map_.Lookup(delegate_id); 216 const {
217 return idle_cleanup_timer_.IsRunning();
218 }
219
220 void RendererWebMediaPlayerDelegate::SetFrameHiddenForTesting(bool is_hidden) {
221 if (is_hidden == is_frame_hidden_for_testing_)
222 return;
223
224 if (is_hidden) {
225 is_frame_hidden_for_testing_ = true;
226 } else {
227 is_frame_hidden_for_testing_ = false;
228 background_video_allowed_ = false;
229 }
230
231 ScheduleUpdateTask();
232 }
233
234 void RendererWebMediaPlayerDelegate::OnMediaDelegatePause(int player_id) {
235 RecordAction(base::UserMetricsAction("Media.Controls.RemotePause"));
236
237 Observer* observer = id_map_.Lookup(player_id);
159 if (observer) { 238 if (observer) {
160 if (playing_videos_.find(delegate_id) != playing_videos_.end()) 239 background_video_allowed_ = false;
161 SetIsPlayingBackgroundVideo(false);
162 observer->OnPause(); 240 observer->OnPause();
163 } 241 }
164
165 RecordAction(base::UserMetricsAction("Media.Controls.RemotePause"));
166 } 242 }
167 243
168 void RendererWebMediaPlayerDelegate::OnMediaDelegatePlay(int delegate_id) { 244 void RendererWebMediaPlayerDelegate::OnMediaDelegatePlay(int player_id) {
169 Observer* observer = id_map_.Lookup(delegate_id); 245 RecordAction(base::UserMetricsAction("Media.Controls.RemotePlay"));
246
247 Observer* observer = id_map_.Lookup(player_id);
170 if (observer) { 248 if (observer) {
171 if (playing_videos_.find(delegate_id) != playing_videos_.end()) 249 // TODO(sandersd): Ideally we would only set the flag if the player has
172 SetIsPlayingBackgroundVideo(IsHidden()); 250 // video, but we don't reliably know if a paused player has video.
251 if (IsFrameHidden() && !IsFrameClosed())
252 background_video_allowed_ = true;
173 observer->OnPlay(); 253 observer->OnPlay();
174 } 254 }
175
176 RecordAction(base::UserMetricsAction("Media.Controls.RemotePlay"));
177 } 255 }
178 256
179 void RendererWebMediaPlayerDelegate::OnMediaDelegateSuspendAllMediaPlayers() { 257 void RendererWebMediaPlayerDelegate::OnMediaDelegateSuspendAllMediaPlayers() {
258 is_frame_closed_ = true;
259
180 for (IDMap<Observer*>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance()) 260 for (IDMap<Observer*>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance())
181 it.GetCurrentValue()->OnSuspendRequested(true); 261 it.GetCurrentValue()->OnFrameClosed();
182 } 262 }
183 263
184 void RendererWebMediaPlayerDelegate::OnMediaDelegateVolumeMultiplierUpdate( 264 void RendererWebMediaPlayerDelegate::OnMediaDelegateVolumeMultiplierUpdate(
185 int delegate_id, 265 int player_id,
186 double multiplier) { 266 double multiplier) {
187 Observer* observer = id_map_.Lookup(delegate_id); 267 Observer* observer = id_map_.Lookup(player_id);
188 if (observer) 268 if (observer)
189 observer->OnVolumeMultiplierUpdate(multiplier); 269 observer->OnVolumeMultiplierUpdate(multiplier);
190 } 270 }
191 271
192 void RendererWebMediaPlayerDelegate::AddIdleDelegate(int delegate_id) { 272 void RendererWebMediaPlayerDelegate::ScheduleUpdateTask() {
193 idle_delegate_map_[delegate_id] = tick_clock_->NowTicks(); 273 if (!pending_update_task_) {
194 if (!idle_cleanup_timer_.IsRunning()) { 274 base::ThreadTaskRunnerHandle::Get()->PostTask(
275 FROM_HERE,
276 base::Bind(&RendererWebMediaPlayerDelegate::UpdateTask, AsWeakPtr()));
277 pending_update_task_ = true;
278 }
279 }
280
281 void RendererWebMediaPlayerDelegate::UpdateTask() {
282 DVLOG(3) << __func__;
283 pending_update_task_ = false;
284
285 // Check whether a player was played since the last UpdateTask(). We basically
286 // treat this as a parameter to UpdateTask(), except that it can be changed
287 // between posting the task and UpdateTask() executing.
288 bool has_played_video_since_last_update_task = has_played_video_;
289 has_played_video_ = false;
290
291 // Record UMAs for background video playback.
292 RecordBackgroundVideoPlayback();
293
294 // Clean up idle players.
295 bool aggressive_cleanup = false;
296
297 // When we reach the maximum number of idle players, clean them up
298 // aggressively. Values chosen after testing on a Galaxy Nexus device for
299 // http://crbug.com/612909.
300 if (idle_player_map_.size() > (is_low_end_device_ ? 2u : 8u))
301 aggressive_cleanup = true;
302
303 // When a player plays on a low-end device, clean up idle players
304 // aggressively.
305 if (has_played_video_since_last_update_task && is_low_end_device_)
306 aggressive_cleanup = true;
307
308 CleanUpIdlePlayers(aggressive_cleanup ? base::TimeDelta() : idle_timeout_);
309
310 // If there are still idle players, schedule an attempt to clean them up.
311 // This construct ensures that the next callback is always
312 // |idle_cleanup_interval_| from now.
313 idle_cleanup_timer_.Stop();
314 if (!idle_player_map_.empty()) {
195 idle_cleanup_timer_.Start( 315 idle_cleanup_timer_.Start(
196 FROM_HERE, idle_cleanup_interval_, 316 FROM_HERE, idle_cleanup_interval_,
197 base::Bind(&RendererWebMediaPlayerDelegate::CleanupIdleDelegates, 317 base::Bind(&RendererWebMediaPlayerDelegate::UpdateTask,
198 base::Unretained(this), idle_timeout_)); 318 base::Unretained(this)));
319 }
320 }
321
322 void RendererWebMediaPlayerDelegate::RecordBackgroundVideoPlayback() {
323 #if defined(OS_ANDROID)
324 // TODO(avayvod): This would be useful to collect on desktop too and express
325 // in actual media watch time vs. just elapsed time.
326 // See https://crbug.com/638726.
327 bool has_playing_background_video =
328 IsFrameHidden() && !IsFrameClosed() && !playing_videos_.empty();
329
330 if (has_playing_background_video != was_playing_background_video_) {
331 was_playing_background_video_ = has_playing_background_video;
332
333 if (has_playing_background_video) {
334 RecordAction(base::UserMetricsAction("Media.Session.BackgroundResume"));
335 background_video_start_time_ = base::TimeTicks::Now();
336 } else {
337 RecordAction(base::UserMetricsAction("Media.Session.BackgroundSuspend"));
338 UMA_HISTOGRAM_CUSTOM_TIMES(
339 "Media.Android.BackgroundVideoTime",
340 base::TimeTicks::Now() - background_video_start_time_,
341 base::TimeDelta::FromSeconds(7), base::TimeDelta::FromHours(10), 50);
342 }
343 }
344 #endif // OS_ANDROID
345 }
346
347 void RendererWebMediaPlayerDelegate::CleanUpIdlePlayers(
348 base::TimeDelta timeout) {
349 const base::TimeTicks now = tick_clock_->NowTicks();
350
351 // Create a list of stale players before making any possibly reentrant calls
352 // to OnIdleTimeout().
353 std::vector<int> stale_players;
354 for (const auto& it : idle_player_map_) {
355 if (now - it.second >= timeout)
356 stale_players.push_back(it.first);
199 } 357 }
200 358
201 // When we reach the maximum number of idle players, aggressively suspend idle 359 // Notify stale players.
202 // delegates to try and remain under the limit. Values chosen after testing on 360 for (int player_id : stale_players) {
203 // a Galaxy Nexus device for http://crbug.com/612909. 361 Observer* player = id_map_.Lookup(player_id);
204 if (idle_delegate_map_.size() > (is_low_end_device_ ? 2u : 8u)) 362 if (player && idle_player_map_.erase(player_id)) {
205 CleanupIdleDelegates(base::TimeDelta()); 363 stale_players_.insert(player_id);
206 } 364 player->OnIdleTimeout();
207
208 void RendererWebMediaPlayerDelegate::RemoveIdleDelegate(int delegate_id) {
209 // To avoid invalidating the iterator, just mark the delegate for deletion
210 // using a sentinel value of an empty TimeTicks.
211 if (idle_cleanup_running_) {
212 idle_delegate_map_[delegate_id] = base::TimeTicks();
213 return;
214 }
215
216 idle_delegate_map_.erase(delegate_id);
217 if (idle_delegate_map_.empty())
218 idle_cleanup_timer_.Stop();
219 }
220
221 void RendererWebMediaPlayerDelegate::CleanupIdleDelegates(
222 base::TimeDelta timeout) {
223 // Drop reentrant cleanups which can occur during forced suspension when the
224 // number of idle delegates is too high for a given device.
225 if (idle_cleanup_running_)
226 return;
227
228 // Iterate over the delegates and suspend the idle ones. Note: The call to
229 // OnSuspendRequested() can trigger calls into RemoveIdleDelegate(), so for
230 // iterator validity we set |idle_cleanup_running_| to true and defer
231 // deletions.
232 DCHECK(!idle_cleanup_running_);
233 base::AutoReset<bool> scoper(&idle_cleanup_running_, true);
234 const base::TimeTicks now = tick_clock_->NowTicks();
235 for (auto& idle_delegate_entry : idle_delegate_map_) {
236 if (now - idle_delegate_entry.second > timeout) {
237 if (id_map_.Lookup(idle_delegate_entry.first)
238 ->OnSuspendRequested(false)) {
239 // If the player accepted the suspension, mark it for removal
240 // from future polls to avoid running the timer forever.
241 idle_delegate_entry.second = base::TimeTicks();
242 }
243 } 365 }
244 } 366 }
245
246 // Take care of any removals that happened during the above iteration.
247 for (auto it = idle_delegate_map_.begin(); it != idle_delegate_map_.end();) {
248 if (it->second.is_null())
249 it = idle_delegate_map_.erase(it);
250 else
251 ++it;
252 }
253
254 // Shutdown the timer if no delegates are left.
255 if (idle_delegate_map_.empty())
256 idle_cleanup_timer_.Stop();
257 }
258
259 void RendererWebMediaPlayerDelegate::SetIsPlayingBackgroundVideo(
260 bool is_playing) {
261 if (is_playing_background_video_ == is_playing) return;
262
263 // TODO(avayvod): This would be useful to collect on desktop too and express in
264 // actual media watch time vs. just elapsed time. See https://crbug.com/638726.
265 #if defined(OS_ANDROID)
266 if (is_playing_background_video_) {
267 UMA_HISTOGRAM_CUSTOM_TIMES(
268 "Media.Android.BackgroundVideoTime",
269 base::TimeTicks::Now() - background_video_playing_start_time_,
270 base::TimeDelta::FromSeconds(7), base::TimeDelta::FromHours(10), 50);
271 RecordAction(base::UserMetricsAction("Media.Session.BackgroundSuspend"));
272 } else {
273 background_video_playing_start_time_ = base::TimeTicks::Now();
274 RecordAction(base::UserMetricsAction("Media.Session.BackgroundResume"));
275 }
276 #endif // OS_ANDROID
277
278 is_playing_background_video_ = is_playing;
279 } 367 }
280 368
281 void RendererWebMediaPlayerDelegate::OnDestruct() { 369 void RendererWebMediaPlayerDelegate::OnDestruct() {
282 delete this; 370 delete this;
283 } 371 }
284 372
285 } // namespace media 373 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698