summaryrefslogtreecommitdiffstats
path: root/webkit/media/webmediaplayer_proxy.cc
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-20 00:51:52 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-20 00:51:52 +0000
commitc566cb79b77ee9dfe3f287fb930c2e9e419793d3 (patch)
treee5dc3c731b7d7ca2399d412bcf96825b4de67bcf /webkit/media/webmediaplayer_proxy.cc
parent2767ca041af88d18e387d59c12a49fff10443ce8 (diff)
downloadchromium_src-c566cb79b77ee9dfe3f287fb930c2e9e419793d3.zip
chromium_src-c566cb79b77ee9dfe3f287fb930c2e9e419793d3.tar.gz
chromium_src-c566cb79b77ee9dfe3f287fb930c2e9e419793d3.tar.bz2
Fix ChunkDemuxer so it properly outputs buffered ranges.
BUG=133042 TEST=None. Verified manually by a simple test page that appends some data and then checks the buffered attribute. I will convert this to a LayoutTest soon. Review URL: https://chromiumcodereview.appspot.com/10558011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media/webmediaplayer_proxy.cc')
-rw-r--r--webkit/media/webmediaplayer_proxy.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/webkit/media/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc
index 8b2adc1..2809e68 100644
--- a/webkit/media/webmediaplayer_proxy.cc
+++ b/webkit/media/webmediaplayer_proxy.cc
@@ -200,10 +200,9 @@ void WebMediaPlayerProxy::DemuxerRemoveId(const std::string& id) {
chunk_demuxer_->RemoveId(id);
}
-bool WebMediaPlayerProxy::DemuxerBufferedRange(
- const std::string& id,
- media::ChunkDemuxer::Ranges* ranges_out) {
- return chunk_demuxer_->GetBufferedRanges(id, ranges_out);
+media::Ranges<base::TimeDelta> WebMediaPlayerProxy::DemuxerBufferedRange(
+ const std::string& id) {
+ return chunk_demuxer_->GetBufferedRanges(id);
}
bool WebMediaPlayerProxy::DemuxerAppend(const std::string& id,