Merge 21999 - BufferedDataSource to support server without range request supp...

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"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/null_audio_renderer.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/glue/media/video_renderer_impl.h"
 
 using WebKit::WebCanvas;
@@ skipping 238 matching lines @@
 
 bool WebMediaPlayerImpl::totalBytesKnown() {
   DCHECK(MessageLoop::current() == main_loop_);
 
   return pipeline_->GetTotalBytes() != 0;
 }
 
 bool WebMediaPlayerImpl::hasVideo() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
-  size_t width, height;
-  pipeline_->GetVideoSize(&width, &height);
-  return width != 0 && height != 0;
+  return pipeline_->IsRendered(media::mime_type::kMajorTypeVideo);
 }
 
 WebKit::WebSize WebMediaPlayerImpl::naturalSize() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
   size_t width, height;
   pipeline_->GetVideoSize(&width, &height);
   return WebKit::WebSize(width, height);
 }
 
@@ skipping 30 matching lines @@
 
 float WebMediaPlayerImpl::maxTimeBuffered() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
   return static_cast<float>(pipeline_->GetBufferedTime().InSecondsF());
 }
 
 float WebMediaPlayerImpl::maxTimeSeekable() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
-  // TODO(scherkus): move this logic down into the pipeline.
-  if (pipeline_->GetTotalBytes() == 0) {
+  // 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())
     return 0.0f;
-  }
-  double total_bytes = static_cast<double>(pipeline_->GetTotalBytes());
-  double buffered_bytes = static_cast<double>(pipeline_->GetBufferedBytes());
-  double duration = static_cast<double>(pipeline_->GetDuration().InSecondsF());
-  return static_cast<float>(duration * (buffered_bytes / total_bytes));
+  return static_cast<float>(pipeline_->GetDuration().InSecondsF());
 }
 
 unsigned long long WebMediaPlayerImpl::bytesLoaded() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
   return pipeline_->GetBufferedBytes();
 }
 
 unsigned long long WebMediaPlayerImpl::totalBytes() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
   return pipeline_->GetTotalBytes();
 }
 
 void WebMediaPlayerImpl::setSize(const WebSize& size) {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(proxy_);
 
   proxy_->SetSize(gfx::Rect(0, 0, size.width, size.height));
 }
 
 void WebMediaPlayerImpl::paint(WebCanvas* canvas,
                                const WebRect& rect) {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(proxy_);
 
   proxy_->Paint(canvas, rect);
 }
 
+bool WebMediaPlayerImpl::hasSingleSecurityOrigin() const {
+  // TODO(hclam): Implement this.
+  return false;
+}
+
+WebKit::WebMediaPlayer::MovieLoadType
+    WebMediaPlayerImpl::movieLoadType() const {
+  DCHECK(MessageLoop::current() == main_loop_);
+
+  // TODO(hclam): If the pipeline is performing streaming, we say that this is
+  // a live stream. But instead it should be a StoredStream if we have proper
+  // caching.
+  if (pipeline_->IsStreaming())
+    return WebKit::WebMediaPlayer::LiveStream;
+  return WebKit::WebMediaPlayer::Unknown;
+}
+
 void WebMediaPlayerImpl::WillDestroyCurrentMessageLoop() {
   Destroy();
   main_loop_ = NULL;
 }
 
 void WebMediaPlayerImpl::Repaint() {
   DCHECK(MessageLoop::current() == main_loop_);
   GetClient()->repaint();
 }
 
@@ skipping 56 matching lines @@
   }
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_glue