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

Unified Diff: media/filters/chunk_demuxer.cc

Issue 10701130: Fix buffered range reporting for ChunkDemuxer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 5 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
« no previous file with comments | « media/base/pipeline.cc ('k') | media/filters/pipeline_integration_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index d4e5ce9438204c2cb902eb87e8cc72b6b68fb61b..ead7956de6e412d3f4a460aa4bc8a045c0252094 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -723,14 +723,12 @@ bool ChunkDemuxer::AppendData(const std::string& id,
std::swap(cb, seek_cb_);
}
- if (duration_ > TimeDelta() && duration_ != kInfiniteDuration()) {
Ami GONE FROM CHROMIUM 2012/07/10 23:11:12 Do you want to DCHECK these during init?
acolwell GONE FROM CHROMIUM 2012/07/10 23:19:30 No. These were just here for the old byte range co
- if (audio_ && !video_) {
- ranges = audio_->GetBufferedRanges();
- } else if (!audio_ && video_) {
- ranges = video_->GetBufferedRanges();
- } else {
- ranges = ComputeIntersection();
- }
+ if (audio_ && !video_) {
+ ranges = audio_->GetBufferedRanges();
+ } else if (!audio_ && video_) {
+ ranges = video_->GetBufferedRanges();
+ } else {
+ ranges = ComputeIntersection();
}
}
« no previous file with comments | « media/base/pipeline.cc ('k') | media/filters/pipeline_integration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698