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

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

Issue 1850733003: Media: Report informational error messages to HTMLMediaElement (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use_locking_in_rendermedialog
Patch Set: Rebase to ToT, address watk@'s nits. Created 4 years, 8 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 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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 WebMediaPlayer::NetworkState WebMediaPlayerImpl::getNetworkState() const { 629 WebMediaPlayer::NetworkState WebMediaPlayerImpl::getNetworkState() const {
630 DCHECK(main_task_runner_->BelongsToCurrentThread()); 630 DCHECK(main_task_runner_->BelongsToCurrentThread());
631 return network_state_; 631 return network_state_;
632 } 632 }
633 633
634 WebMediaPlayer::ReadyState WebMediaPlayerImpl::getReadyState() const { 634 WebMediaPlayer::ReadyState WebMediaPlayerImpl::getReadyState() const {
635 DCHECK(main_task_runner_->BelongsToCurrentThread()); 635 DCHECK(main_task_runner_->BelongsToCurrentThread());
636 return ready_state_; 636 return ready_state_;
637 } 637 }
638 638
639 blink::WebString WebMediaPlayerImpl::getErrorMessage() {
640 DCHECK(main_task_runner_->BelongsToCurrentThread());
641 return blink::WebString::fromUTF8(media_log_->GetLastErrorMessage());
642 }
643
639 blink::WebTimeRanges WebMediaPlayerImpl::buffered() const { 644 blink::WebTimeRanges WebMediaPlayerImpl::buffered() const {
640 DCHECK(main_task_runner_->BelongsToCurrentThread()); 645 DCHECK(main_task_runner_->BelongsToCurrentThread());
641 646
642 Ranges<base::TimeDelta> buffered_time_ranges = 647 Ranges<base::TimeDelta> buffered_time_ranges =
643 pipeline_.GetBufferedTimeRanges(); 648 pipeline_.GetBufferedTimeRanges();
644 649
645 const base::TimeDelta duration = pipeline_.GetMediaDuration(); 650 const base::TimeDelta duration = pipeline_.GetMediaDuration();
646 if (duration != kInfiniteDuration()) { 651 if (duration != kInfiniteDuration()) {
647 buffered_data_source_host_.AddBufferedTimeRanges( 652 buffered_data_source_host_.AddBufferedTimeRanges(
648 &buffered_time_ranges, duration); 653 &buffered_time_ranges, duration);
(...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after
1569 << ", Video: " << stats.video_memory_usage << ", DataSource: " 1574 << ", Video: " << stats.video_memory_usage << ", DataSource: "
1570 << (data_source_ ? data_source_->GetMemoryUsage() : 0) 1575 << (data_source_ ? data_source_->GetMemoryUsage() : 0)
1571 << ", Demuxer: " << demuxer_memory_usage; 1576 << ", Demuxer: " << demuxer_memory_usage;
1572 1577
1573 const int64_t delta = current_memory_usage - last_reported_memory_usage_; 1578 const int64_t delta = current_memory_usage - last_reported_memory_usage_;
1574 last_reported_memory_usage_ = current_memory_usage; 1579 last_reported_memory_usage_ = current_memory_usage;
1575 adjust_allocated_memory_cb_.Run(delta); 1580 adjust_allocated_memory_cb_.Run(delta);
1576 } 1581 }
1577 1582
1578 } // namespace media 1583 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_impl.h ('k') | third_party/WebKit/Source/core/html/HTMLVideoElementTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698