Buffered time ranges for <video>

webkit/glue/webmediaplayer_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.
 
 #include "webkit/glue/webmediaplayer_impl.h"
 
 #include "base/command_line.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/media_format.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
@@ skipping 350 matching lines @@
   DCHECK(MessageLoop::current() == main_loop_);
 
   return pipeline_->GetPlaybackRate() == 0.0f;
 }
 
 bool WebMediaPlayerImpl::seeking() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
   if (ready_state_ == WebKit::WebMediaPlayer::HaveNothing)
     return false;
-  
+
   return ready_state_ == WebKit::WebMediaPlayer::HaveMetadata;
 }
 
 float WebMediaPlayerImpl::duration() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
   return static_cast<float>(pipeline_->GetDuration().InSecondsF());
 }
 
 float WebMediaPlayerImpl::currentTime() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
   return static_cast<float>(pipeline_->GetCurrentTime().InSecondsF());
 }
 
 int WebMediaPlayerImpl::dataRate() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
   // TODO(hclam): Add this method call if pipeline has it in the interface.
   return 0;
 }
 
-float WebMediaPlayerImpl::maxTimeBuffered() const {
+const WebKit::WebTimeRanges& WebMediaPlayerImpl::buffered() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
-  return static_cast<float>(pipeline_->GetBufferedTime().InSecondsF());
+  return buffered_;
 }
 
 float WebMediaPlayerImpl::maxTimeSeekable() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
   // If we are performing streaming, we report that we cannot seek at all.
   // We are using this flag to indicate if the data source supports seeking
   // or not. We should be able to seek even if we are performing streaming.
   // TODO(hclam): We need to update this when we have better caching.
   if (pipeline_->IsStreaming())
@@ skipping 56 matching lines @@
 }
 
 void WebMediaPlayerImpl::Repaint() {
   DCHECK(MessageLoop::current() == main_loop_);
   GetClient()->repaint();
 }
 
 void WebMediaPlayerImpl::OnPipelineInitialize() {
   DCHECK(MessageLoop::current() == main_loop_);
   if (pipeline_->GetError() == media::PIPELINE_OK) {
+    // Only keep one time range starting from 0.
+    buffered_.push_back(
+        WebKit::WebTimeRange(
+            0.0f,
+            static_cast<float>(pipeline_->GetBufferedTime().InSecondsF())));
+
     // Since we have initialized the pipeline, say we have everything.
     // TODO(hclam): change this to report the correct status.
     SetReadyState(WebKit::WebMediaPlayer::HaveMetadata);
     SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData);
     if (pipeline_->IsLoaded()) {
       SetNetworkState(WebKit::WebMediaPlayer::Loaded);
     } else {
       SetNetworkState(WebKit::WebMediaPlayer::Loading);
     }
   } else {
@@ skipping 91 matching lines @@
   }
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_glue