Merge 143765 - Ensure media's buffered ranges always have a range that includes currentTime.

media/base/pipeline.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/pipeline.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 186 matching lines @@
 TimeDelta Pipeline::GetCurrentTime_Locked() const {
   lock_.AssertAcquired();
   return clock_->Elapsed();
 }
 
 Ranges<TimeDelta> Pipeline::GetBufferedTimeRanges() {
   base::AutoLock auto_lock(lock_);
   Ranges<TimeDelta> time_ranges;
   if (clock_->Duration() == TimeDelta() || total_bytes_ == 0)
     return time_ranges;
+  for (size_t i = 0; i < buffered_time_ranges_.size(); ++i) {
+    time_ranges.Add(buffered_time_ranges_.start(i),
+                    buffered_time_ranges_.end(i));
+  }
   for (size_t i = 0; i < buffered_byte_ranges_.size(); ++i) {
     TimeDelta start = TimeForByteOffset_Locked(buffered_byte_ranges_.start(i));
     TimeDelta end = TimeForByteOffset_Locked(buffered_byte_ranges_.end(i));
     // Cap approximated buffered time at the length of the video.
     end = std::min(end, clock_->Duration());
     time_ranges.Add(start, end);
   }
 
   return time_ranges;
 }
@@ skipping 233 matching lines @@
   return time_offset;
 }
 
 void Pipeline::AddBufferedByteRange(int64 start, int64 end) {
   DCHECK(IsRunning());
   base::AutoLock auto_lock(lock_);
   buffered_byte_ranges_.Add(start, end);
   did_loading_progress_ = true;
 }
 
+void Pipeline::AddBufferedTimeRange(base::TimeDelta start,
+                                    base::TimeDelta end) {
+  DCHECK(IsRunning());
+  base::AutoLock auto_lock(lock_);
+  buffered_time_ranges_.Add(start, end);
+  did_loading_progress_ = true;
+}
+
 void Pipeline::SetNaturalVideoSize(const gfx::Size& size) {
   DCHECK(IsRunning());
   media_log_->AddEvent(media_log_->CreateVideoSizeSetEvent(
       size.width(), size.height()));
 
   base::AutoLock auto_lock(lock_);
   natural_size_ = size;
 }
 
 void Pipeline::NotifyEnded() {
@@ skipping 806 matching lines @@
 void Pipeline::StartClockIfWaitingForTimeUpdate_Locked() {
   lock_.AssertAcquired();
   if (!waiting_for_clock_update_)
     return;
 
   waiting_for_clock_update_ = false;
   clock_->Play();
 }
 
 }  // namespace media