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;
+  TimeDelta current_time = GetCurrentTime_Locked();
   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());
+    // HACK: Extend the last range preceding the current time to include the
+    // current time, to avoid disappearing/reappearing buffered bar.
+    // TODO(fischman): remove this HACK when we have time-based buffered-range
+    // tracking (http://crbug.com/133588).
+    if ((i + 1 == buffered_byte_ranges_.size()) ||

[scherkus (not reviewing), 2012/06/21 01:10:38]

brackets around (i + 1) for warm fuzzy feeling please

+        (current_time > start && current_time <
+         TimeForByteOffset_Locked((buffered_byte_ranges_.start(i + 1))))) {
+      end = std::max(end, current_time + TimeDelta::FromSeconds(1));
+    }
     time_ranges.Add(start, end);
   }
 
   return time_ranges;
 }
 
 TimeDelta Pipeline::GetMediaDuration() const {
   base::AutoLock auto_lock(lock_);
   return clock_->Duration();
 }
@@ skipping 1054 matching lines @@
 void Pipeline::StartClockIfWaitingForTimeUpdate_Locked() {
   lock_.AssertAcquired();
   if (!waiting_for_clock_update_)
     return;
 
   waiting_for_clock_update_ = false;
   clock_->Play();
 }
 
 }  // namespace media