Calculate the buffered ranges in ChunkDemuxer::GetBufferedRanges()

media/filters/chunk_demuxer.cc

Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index 1e1615465a4b53dc727f56b6d1b6ea49ea7fd0ee..669ad790a55807edd6e4f8f68290fca6771a6723 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -133,6 +133,9 @@ class ChunkDemuxerStream : public DemuxerStream {
   // Returns true if buffers were successfully added.
   bool Append(const StreamParser::BufferQueue& buffers);
 
+  // Returns a list of the buffered time ranges.
+  SourceBufferStream::TimespanList GetBufferedTime() const;
+
   // Called when mid-stream config updates occur.
   // Returns true if the new config is accepted.
   // Returns false if the new config should trigger an error.
@@ -246,6 +249,11 @@ bool ChunkDemuxerStream::Append(const StreamParser::BufferQueue& buffers) {
   return true;
 }
 
+SourceBufferStream::TimespanList ChunkDemuxerStream::GetBufferedTime() const {
+  base::AutoLock auto_lock(lock_);
+  return stream_->GetBufferedTime();
+}
+
 bool ChunkDemuxerStream::UpdateAudioConfig(const AudioDecoderConfig& config) {
   DCHECK(config.IsValidConfig());
   DCHECK_EQ(type_, AUDIO);
@@ -580,12 +588,98 @@ bool ChunkDemuxer::GetBufferedRanges(const std::string& id,
                                      Ranges* ranges_out) const {
   DCHECK(!id.empty());
   DCHECK_GT(stream_parser_map_.count(id), 0u);
+  DCHECK(id == source_id_audio_ || id == source_id_video_);
   DCHECK(ranges_out);
 
   base::AutoLock auto_lock(lock_);
 
-  // TODO(annacc): Calculate buffered ranges (http://crbug.com/129852 ).
-  return false;
+  if (id == source_id_audio_ && id != source_id_video_) {
+    // Only include ranges that have been buffered in |audio_|
+    return CopyIntoRanges(audio_->GetBufferedTime(), ranges_out);
+  }
+
+  if (id != source_id_audio_ && id == source_id_video_) {
+    // Only include ranges that have been buffered in |video_|
+    return CopyIntoRanges(video_->GetBufferedTime(), ranges_out);
+  }
+
+  // Include ranges that have been buffered in both |audio_| and |video_|.
+  SourceBufferStream::TimespanList audio_ranges = audio_->GetBufferedTime();
+  SourceBufferStream::TimespanList video_ranges = video_->GetBufferedTime();
+  SourceBufferStream::TimespanList::const_iterator video_ranges_itr =
+      video_ranges.begin();
+  SourceBufferStream::TimespanList::const_iterator audio_ranges_itr =
+      audio_ranges.begin();
+  bool success = false;
+
+  while (audio_ranges_itr != audio_ranges.end() &&
+         video_ranges_itr != video_ranges.end()) {
+

[acolwell GONE FROM CHROMIUM, 2012/06/13 00:33:40]

nit: remove blank line

[annacc, 2012/06/13 03:35:43]

Done.

+    // If this is the last range and EndOfStream() was called (i.e. all data
+    // has been appended), choose the max end point of the ranges.
+    bool last_range_after_ended =
+        state_ == ENDED &&
+        (audio_ranges_itr + 1) == audio_ranges.end() &&
+        (video_ranges_itr + 1) == video_ranges.end();
+
+    // Audio range start time is within the video range.
+    if ((*audio_ranges_itr).first >= (*video_ranges_itr).first &&
+        (*audio_ranges_itr).first <= (*video_ranges_itr).second) {
+      AddIntersectionRange(*audio_ranges_itr, *video_ranges_itr,
+                           last_range_after_ended, ranges_out);
+      audio_ranges_itr++;
+      success = true;
+      continue;
+    }
+
+    // Video range start time is within the audio range.
+    if ((*video_ranges_itr).first >= (*audio_ranges_itr).first &&
+        (*video_ranges_itr).first <= (*audio_ranges_itr).second) {
+      AddIntersectionRange(*video_ranges_itr, *audio_ranges_itr,
+                           last_range_after_ended, ranges_out);
+      video_ranges_itr++;
+      success = true;
+      continue;
+    }
+
+    // No overlap was found.  Increment the earliest one and keep looking.
+    if ((*audio_ranges_itr).first < (*video_ranges_itr).first)
+      audio_ranges_itr++;
+    else
+      video_ranges_itr++;
+  }
+
+  return success;
+}
+
+bool ChunkDemuxer::CopyIntoRanges(
+    const SourceBufferStream::TimespanList& timespans,
+    Ranges* ranges_out) const {
+  bool success = false;
+  for (SourceBufferStream::TimespanList::const_iterator itr = timespans.begin();
+       itr != timespans.end(); ++itr) {
+    ranges_out->push_back(*itr);
+    success = true;
+  }
+  return success;

[acolwell GONE FROM CHROMIUM, 2012/06/13 00:33:40]

nit: You can use !timestamps.empty() here instead.

[annacc, 2012/06/13 03:35:43]

Done.

+}
+
+void ChunkDemuxer::AddIntersectionRange(
+    SourceBufferStream::Timespan timespan_a,
+    SourceBufferStream::Timespan timespan_b,
+    bool last_range_after_ended,
+    Ranges* ranges_out) const {
+  base::TimeDelta start = timespan_a.first;
+
+  // If this is the last range after EndOfStream() was called, choose the later
+  // end point of the ranges, otherwise choose the earlier.
+  base::TimeDelta end;
+  if (last_range_after_ended)
+    end = std::max(timespan_a.second, timespan_b.second);
+  else
+    end = std::min(timespan_a.second, timespan_b.second);
+
+  ranges_out->push_back(std::make_pair(start, end));
 }
 
 bool ChunkDemuxer::AppendData(const std::string& id,