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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 : OverlayMode::kUseContentVideoView; | 277 : OverlayMode::kUseContentVideoView; |
278 } else { | 278 } else { |
279 overlay_mode_ = OverlayMode::kNoOverlays; | 279 overlay_mode_ = OverlayMode::kNoOverlays; |
280 } | 280 } |
281 | 281 |
282 delegate_id_ = delegate_->AddObserver(this); | 282 delegate_id_ = delegate_->AddObserver(this); |
283 delegate_->SetIdle(delegate_id_, true); | 283 delegate_->SetIdle(delegate_id_, true); |
284 | 284 |
285 media_log_->AddEvent(media_log_->CreateCreatedEvent( | 285 media_log_->AddEvent(media_log_->CreateCreatedEvent( |
286 url::Origin(frame_->GetSecurityOrigin()).GetURL().spec())); | 286 url::Origin(frame_->GetSecurityOrigin()).GetURL().spec())); |
| 287 media_log_->SetStringProperty("frame_url", |
| 288 frame_->GetDocument().Url().GetString().Utf8()); |
| 289 media_log_->SetStringProperty("frame_title", |
| 290 frame_->GetDocument().Title().Utf8()); |
287 | 291 |
288 if (params->initial_cdm()) | 292 if (params->initial_cdm()) |
289 SetCdm(params->initial_cdm()); | 293 SetCdm(params->initial_cdm()); |
290 | 294 |
291 // TODO(xhwang): When we use an external Renderer, many methods won't work, | 295 // TODO(xhwang): When we use an external Renderer, many methods won't work, |
292 // e.g. GetCurrentFrameFromCompositor(). See http://crbug.com/434861 | 296 // e.g. GetCurrentFrameFromCompositor(). See http://crbug.com/434861 |
293 audio_source_provider_ = new WebAudioSourceProviderImpl( | 297 audio_source_provider_ = new WebAudioSourceProviderImpl( |
294 params->audio_renderer_sink(), media_log_.get()); | 298 params->audio_renderer_sink(), media_log_.get()); |
295 | 299 |
296 if (observer_) | 300 if (observer_) |
(...skipping 2305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2602 } | 2606 } |
2603 | 2607 |
2604 #undef UMA_HISTOGRAM_VIDEO_HEIGHT | 2608 #undef UMA_HISTOGRAM_VIDEO_HEIGHT |
2605 | 2609 |
2606 void WebMediaPlayerImpl::SetTickClockForTest(base::TickClock* tick_clock) { | 2610 void WebMediaPlayerImpl::SetTickClockForTest(base::TickClock* tick_clock) { |
2607 tick_clock_.reset(tick_clock); | 2611 tick_clock_.reset(tick_clock); |
2608 buffered_data_source_host_.SetTickClockForTest(tick_clock); | 2612 buffered_data_source_host_.SetTickClockForTest(tick_clock); |
2609 } | 2613 } |
2610 | 2614 |
2611 } // namespace media | 2615 } // namespace media |
OLD | NEW |