OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/webmediaplayer_impl.h" | 5 #include "media/blink/webmediaplayer_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <limits> | 9 #include <limits> |
10 #include <string> | 10 #include <string> |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
172 base::Bind(&WebMediaPlayerImpl::OnPipelineSuspended, AsWeakPtr()), | 172 base::Bind(&WebMediaPlayerImpl::OnPipelineSuspended, AsWeakPtr()), |
173 base::Bind(&WebMediaPlayerImpl::OnError, AsWeakPtr())), | 173 base::Bind(&WebMediaPlayerImpl::OnError, AsWeakPtr())), |
174 load_type_(LoadTypeURL), | 174 load_type_(LoadTypeURL), |
175 opaque_(false), | 175 opaque_(false), |
176 playback_rate_(0.0), | 176 playback_rate_(0.0), |
177 paused_(true), | 177 paused_(true), |
178 seeking_(false), | 178 seeking_(false), |
179 pending_suspend_resume_cycle_(false), | 179 pending_suspend_resume_cycle_(false), |
180 ended_(false), | 180 ended_(false), |
181 should_notify_time_changed_(false), | 181 should_notify_time_changed_(false), |
182 fullscreen_(false), | |
183 decoder_requires_restart_for_fullscreen_(false), | 182 decoder_requires_restart_for_fullscreen_(false), |
184 client_(client), | 183 client_(client), |
185 encrypted_client_(encrypted_client), | 184 encrypted_client_(encrypted_client), |
186 delegate_(delegate), | 185 delegate_(delegate), |
187 delegate_id_(0), | 186 delegate_id_(0), |
188 defer_load_cb_(params.defer_load_cb()), | 187 defer_load_cb_(params.defer_load_cb()), |
189 context_3d_cb_(params.context_3d_cb()), | 188 context_3d_cb_(params.context_3d_cb()), |
190 adjust_allocated_memory_cb_(params.adjust_allocated_memory_cb()), | 189 adjust_allocated_memory_cb_(params.adjust_allocated_memory_cb()), |
191 last_reported_memory_usage_(0), | 190 last_reported_memory_usage_(0), |
192 supports_save_(true), | 191 supports_save_(true), |
(...skipping 12 matching lines...) Expand all Loading... | |
205 volume_multiplier_(1.0), | 204 volume_multiplier_(1.0), |
206 renderer_factory_(std::move(renderer_factory)), | 205 renderer_factory_(std::move(renderer_factory)), |
207 surface_manager_(params.surface_manager()), | 206 surface_manager_(params.surface_manager()), |
208 fullscreen_surface_id_(SurfaceManager::kNoSurfaceID), | 207 fullscreen_surface_id_(SurfaceManager::kNoSurfaceID), |
209 suppress_destruction_errors_(false), | 208 suppress_destruction_errors_(false), |
210 can_suspend_state_(CanSuspendState::UNKNOWN) { | 209 can_suspend_state_(CanSuspendState::UNKNOWN) { |
211 DCHECK(!adjust_allocated_memory_cb_.is_null()); | 210 DCHECK(!adjust_allocated_memory_cb_.is_null()); |
212 DCHECK(renderer_factory_); | 211 DCHECK(renderer_factory_); |
213 DCHECK(client_); | 212 DCHECK(client_); |
214 | 213 |
214 fullscreen_ = base::CommandLine::ForCurrentProcess()->HasSwitch( | |
215 switches::kForceMediaPlayerStartingInFullscreenMode); | |
halliwell
2016/07/14 16:37:35
I'm concerned that what we want on ATV is not tech
liberato (no reviews please)
2016/07/14 16:53:36
+1, similar to my comment in PS2 -- we shoudln't o
AndyWu
2016/07/14 19:02:08
Totally agree, what we need is overlay codepath, n
| |
216 | |
215 if (delegate_) | 217 if (delegate_) |
216 delegate_id_ = delegate_->AddObserver(this); | 218 delegate_id_ = delegate_->AddObserver(this); |
217 | 219 |
218 media_log_->AddEvent( | 220 media_log_->AddEvent( |
219 media_log_->CreateEvent(MediaLogEvent::WEBMEDIAPLAYER_CREATED)); | 221 media_log_->CreateEvent(MediaLogEvent::WEBMEDIAPLAYER_CREATED)); |
220 | 222 |
221 if (params.initial_cdm()) { | 223 if (params.initial_cdm()) { |
222 SetCdm(base::Bind(&IgnoreCdmAttached), | 224 SetCdm(base::Bind(&IgnoreCdmAttached), |
223 ToWebContentDecryptionModuleImpl(params.initial_cdm()) | 225 ToWebContentDecryptionModuleImpl(params.initial_cdm()) |
224 ->GetCdmContext()); | 226 ->GetCdmContext()); |
(...skipping 1465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1690 if (isRemote()) | 1692 if (isRemote()) |
1691 return; | 1693 return; |
1692 #endif | 1694 #endif |
1693 | 1695 |
1694 // Idle timeout chosen arbitrarily. | 1696 // Idle timeout chosen arbitrarily. |
1695 background_pause_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(5), | 1697 background_pause_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(5), |
1696 this, &WebMediaPlayerImpl::OnPause); | 1698 this, &WebMediaPlayerImpl::OnPause); |
1697 } | 1699 } |
1698 | 1700 |
1699 } // namespace media | 1701 } // namespace media |
OLD | NEW |