Chromium Code Reviews| 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 973 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 984 const blink::WebString web_label = | 984 const blink::WebString web_label = |
| 985 blink::WebString::fromUTF8(config.label()); | 985 blink::WebString::fromUTF8(config.label()); |
| 986 const blink::WebString web_language = | 986 const blink::WebString web_language = |
| 987 blink::WebString::fromUTF8(config.language()); | 987 blink::WebString::fromUTF8(config.language()); |
| 988 const blink::WebString web_id = | 988 const blink::WebString web_id = |
| 989 blink::WebString::fromUTF8(config.id()); | 989 blink::WebString::fromUTF8(config.id()); |
| 990 | 990 |
| 991 scoped_ptr<WebInbandTextTrackImpl> web_inband_text_track( | 991 scoped_ptr<WebInbandTextTrackImpl> web_inband_text_track( |
| 992 new WebInbandTextTrackImpl(web_kind, web_label, web_language, web_id)); | 992 new WebInbandTextTrackImpl(web_kind, web_label, web_language, web_id)); |
| 993 | 993 |
| 994 scoped_ptr<TextTrack> text_track(new TextTrackImpl( | 994 scoped_ptr<::media::TextTrack> text_track(new TextTrackImpl( |
|
wolenetz
2016/03/23 19:34:12
nit: is prefix '::' needed? Recent feedback on oth
servolk
2016/03/24 01:31:55
Done.
| |
| 995 main_task_runner_, client_, std::move(web_inband_text_track))); | 995 main_task_runner_, client_, std::move(web_inband_text_track))); |
| 996 | 996 |
| 997 done_cb.Run(std::move(text_track)); | 997 done_cb.Run(std::move(text_track)); |
| 998 } | 998 } |
| 999 | 999 |
| 1000 void WebMediaPlayerImpl::OnHidden(bool must_suspend) { | 1000 void WebMediaPlayerImpl::OnHidden(bool must_suspend) { |
| 1001 DCHECK(main_task_runner_->BelongsToCurrentThread()); | 1001 DCHECK(main_task_runner_->BelongsToCurrentThread()); |
| 1002 | 1002 |
| 1003 #if !defined(OS_ANDROID) | 1003 #if !defined(OS_ANDROID) |
| 1004 // Suspend/Resume is enabled by default on Android. | 1004 // Suspend/Resume is enabled by default on Android. |
| (...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1428 << ", Video: " << stats.video_memory_usage << ", DataSource: " | 1428 << ", Video: " << stats.video_memory_usage << ", DataSource: " |
| 1429 << (data_source_ ? data_source_->GetMemoryUsage() : 0) | 1429 << (data_source_ ? data_source_->GetMemoryUsage() : 0) |
| 1430 << ", Demuxer: " << demuxer_memory_usage; | 1430 << ", Demuxer: " << demuxer_memory_usage; |
| 1431 | 1431 |
| 1432 const int64_t delta = current_memory_usage - last_reported_memory_usage_; | 1432 const int64_t delta = current_memory_usage - last_reported_memory_usage_; |
| 1433 last_reported_memory_usage_ = current_memory_usage; | 1433 last_reported_memory_usage_ = current_memory_usage; |
| 1434 adjust_allocated_memory_cb_.Run(delta); | 1434 adjust_allocated_memory_cb_.Run(delta); |
| 1435 } | 1435 } |
| 1436 | 1436 |
| 1437 } // namespace media | 1437 } // namespace media |
| OLD | NEW |