Merge 22087 - Missing buffered attribute for <video>/<audio>...

media/base/pipeline_impl.cc

 // Copyright (c) 2008-2009 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.
 //
 // TODO(scherkus): clean up PipelineImpl... too many crazy function names,
 // potential deadlocks, etc...
 
 #include "base/compiler_specific.h"
 #include "base/condition_variable.h"
 #include "base/stl_util-inl.h"
@@ skipping 193 matching lines @@
   AutoLock auto_lock(lock_);
   base::TimeDelta elapsed = clock_.Elapsed();
   if (elapsed > duration_) {
     return duration_;
   }
   return elapsed;
 }
 
 base::TimeDelta PipelineImpl::GetBufferedTime() const {
   AutoLock auto_lock(lock_);
-  return buffered_time_;
+
+  // If buffered time was set, we report that value directly.
+  if (buffered_time_.ToInternalValue() > 0)
+    return buffered_time_;
+
+  // If buffered time was not set, we use duration and buffered bytes to
+  // estimate the buffered time.
+  // TODO(hclam): The estimation is based on linear interpolation which is
+  // not accurate enough. We should find a better way to estimate the value.
+  if (total_bytes_ == 0)
+    return base::TimeDelta();
+
+  double ratio = static_cast<double>(buffered_bytes_);
+  ratio /= total_bytes_;
+  return base::TimeDelta::FromMilliseconds(
+      static_cast<int64>(duration_.InMilliseconds() * ratio));
 }
 
 base::TimeDelta PipelineImpl::GetDuration() const {
   AutoLock auto_lock(lock_);
   return duration_;
 }
 
 int64 PipelineImpl::GetBufferedBytes() const {
   AutoLock auto_lock(lock_);
   return buffered_bytes_;
@@ skipping 605 matching lines @@
 
   // Reset the pipeline, which will decrement a reference to this object.
   // We will get destroyed as soon as the remaining tasks finish executing.
   // To be safe, we'll set our pipeline reference to NULL.
   filters_.clear();
   filter_types_.clear();
   STLDeleteElements(&filter_threads_);
 }
 
 }  // namespace media