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

Unified Diff: webkit/media/webmediaplayer_impl.cc

Issue 10558011: Fix ChunkDemuxer so it properly outputs buffered ranges. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed everything to use media::Ranges. Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: webkit/media/webmediaplayer_impl.cc
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 588801c471b6b9aaee85eff263a6347216c3f71d..c5d7dd6ec6f85d4e7ddf1dcad6f85e2d9bb49f19 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -656,14 +656,13 @@ bool WebMediaPlayerImpl::sourceRemoveId(const WebKit::WebString& id) {
WebKit::WebTimeRanges WebMediaPlayerImpl::sourceBuffered(
const WebKit::WebString& id) {
- media::ChunkDemuxer::Ranges buffered_ranges;
- if (!proxy_->DemuxerBufferedRange(id.utf8().data(), &buffered_ranges))
- return WebKit::WebTimeRanges();
+ media::Ranges<base::TimeDelta> buffered_ranges =
Ami GONE FROM CHROMIUM 2012/06/19 17:40:37 dedup against buffered()?
acolwell GONE FROM CHROMIUM 2012/06/19 19:50:15 Done. Created a ConvertToWebTimeRanges() helper fu
+ proxy_->DemuxerBufferedRange(id.utf8().data());
WebKit::WebTimeRanges ranges(buffered_ranges.size());
for (size_t i = 0; i < buffered_ranges.size(); i++) {
- ranges[i].start = buffered_ranges[i].first.InSecondsF();
- ranges[i].end = buffered_ranges[i].second.InSecondsF();
+ ranges[i].start = buffered_ranges.start(i).InSecondsF();
+ ranges[i].end = buffered_ranges.end(i).InSecondsF();
}
return ranges;
}

Powered by Google App Engine
This is Rietveld 408576698