Move DataSourceHost to BufferedDataSourceHost.

content/renderer/media/webmediaplayer_impl.cc

 // Copyright 2013 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 "content/renderer/media/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 149 matching lines @@
       client_(client),
       delegate_(delegate),
       defer_load_cb_(params.defer_load_cb()),
       accelerated_compositing_reported_(false),
       incremented_externally_allocated_memory_(false),
       gpu_factories_(RenderThreadImpl::current()->GetGpuFactories()),
       is_local_source_(false),
       supports_save_(true),
       starting_(false),
       chunk_demuxer_(NULL),
+      total_bytes_(0),
+      did_loading_progress_(false),
       compositor_(  // Threaded compositing isn't enabled universally yet.
           (RenderThreadImpl::current()->compositor_message_loop_proxy()
                ? RenderThreadImpl::current()->compositor_message_loop_proxy()
                : base::MessageLoopProxy::current()),
           BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNaturalSizeChange)),
       text_track_index_(0),
       web_cdm_(NULL) {
   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
 
@@ skipping 121 matching lines @@
   media_log_->AddEvent(media_log_->CreateLoadEvent(url.spec()));
 
   // Media source pipelines can start immediately.
   if (load_type == LoadTypeMediaSource) {
     supports_save_ = false;
     StartPipeline();
     return;
   }
 
   // Otherwise it's a regular request which requires resolving the URL first.
-  // TODO(sandersd): Make WMPI a DataSourceHost and pass |this| instead of
-  // |&pipeline_|.
   data_source_.reset(new BufferedDataSource(
       main_loop_,
       frame_,
       media_log_.get(),
-      &pipeline_,
+      this,
       base::Bind(&WebMediaPlayerImpl::NotifyDownloading, AsWeakPtr())));
   data_source_->Initialize(
       url, static_cast<BufferedResourceLoader::CORSMode>(cors_mode),
       base::Bind(
           &WebMediaPlayerImpl::DataSourceInitialized,
           AsWeakPtr(), gurl));
 
   is_local_source_ = !gurl.SchemeIsHTTPOrHTTPS();
 }
 
@@ skipping 160 matching lines @@
 WebMediaPlayer::NetworkState WebMediaPlayerImpl::networkState() const {
   DCHECK(main_loop_->BelongsToCurrentThread());
   return network_state_;
 }
 
 WebMediaPlayer::ReadyState WebMediaPlayerImpl::readyState() const {
   DCHECK(main_loop_->BelongsToCurrentThread());
   return ready_state_;
 }
 
+static base::TimeDelta TimeForByteOffset(
+    int64 byte_offset, int64 total_bytes, base::TimeDelta duration) {
+  double position = static_cast<double>(byte_offset) / total_bytes;
+  // Snap to the beginning/end where the approximation can look especially bad.
+  if (position < 0.01)
+    return base::TimeDelta();
+  if (position > 0.99)
+    return duration;
+  return base::TimeDelta::FromMilliseconds(
+      static_cast<int64>(position * duration.InMilliseconds()));
+}
+
 const blink::WebTimeRanges& WebMediaPlayerImpl::buffered() {
   DCHECK(main_loop_->BelongsToCurrentThread());
-  blink::WebTimeRanges web_ranges(
-      ConvertToWebTimeRanges(pipeline_.GetBufferedTimeRanges()));
-  buffered_.swap(web_ranges);
+  media::Ranges<base::TimeDelta> buffered_time_ranges =
+      pipeline_.GetBufferedTimeRanges();
+  if (total_bytes_ && buffered_byte_ranges_.size()) {
+    base::TimeDelta duration = pipeline_.GetMediaDuration();
+    for (size_t i = 0; i < buffered_byte_ranges_.size(); ++i) {
+      int64 start = buffered_byte_ranges_.start(i);
+      int64 end = buffered_byte_ranges_.end(i);
+      buffered_time_ranges.Add(TimeForByteOffset(start, total_bytes_, duration),
+                               TimeForByteOffset(end, total_bytes_, duration));
+    }
+  }
+  blink::WebTimeRanges buffered(ConvertToWebTimeRanges(buffered_time_ranges));
+  buffered_.swap(buffered);
   return buffered_;
 }
 
 double WebMediaPlayerImpl::maxTimeSeekable() const {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
   // If we haven't even gotten to ReadyStateHaveMetadata yet then just
   // return 0 so that the seekable range is empty.
   if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata)
     return 0.0;
 
   // We don't support seeking in streaming media.
   if (data_source_ && data_source_->IsStreaming())
     return 0.0;
   return duration();
 }
 
+// TODO(sandersd): Why is this const!?

[scherkus (not reviewing), 2014/04/05 00:00:02]

remove this TODO as you now have it in the .h file w/ a bug

 bool WebMediaPlayerImpl::didLoadingProgress() const {
   DCHECK(main_loop_->BelongsToCurrentThread());
-
-  return pipeline_.DidLoadingProgress();
+  bool merged = pipeline_.DidLoadingProgress() || did_loading_progress_;
+  did_loading_progress_ = false;
+  return merged;
 }
 
 void WebMediaPlayerImpl::paint(WebCanvas* canvas,
                                const WebRect& rect,
                                unsigned char alpha) {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
   if (!accelerated_compositing_reported_) {
     accelerated_compositing_reported_ = true;
     // Normally paint() is only called in non-accelerated rendering, but there
@@ skipping 364 matching lines @@
   // TODO(xhwang): Support setMediaKeys(0) if necessary: http://crbug.com/330324
   if (!cdm)
     return;
 
   web_cdm_ = ToWebContentDecryptionModuleImpl(cdm);
 
   if (web_cdm_ && !decryptor_ready_cb_.is_null())
     base::ResetAndReturn(&decryptor_ready_cb_).Run(web_cdm_->GetDecryptor());
 }
 
+void WebMediaPlayerImpl::SetTotalBytes(int64 total_bytes) {
+  DCHECK(main_loop_->BelongsToCurrentThread());
+  total_bytes_ = total_bytes;
+}
+
+void WebMediaPlayerImpl::AddBufferedByteRange(int64 start, int64 end) {
+  DCHECK(main_loop_->BelongsToCurrentThread());
+  buffered_byte_ranges_.Add(start, end);
+  did_loading_progress_ = true;
+}
+
 void WebMediaPlayerImpl::InvalidateOnMainThread() {
   DCHECK(main_loop_->BelongsToCurrentThread());
   TRACE_EVENT0("media", "WebMediaPlayerImpl::InvalidateOnMainThread");
 
   client_->repaint();
 }
 
 void WebMediaPlayerImpl::OnPipelineSeek(PipelineStatus status) {
   DCHECK(main_loop_->BelongsToCurrentThread());
   starting_ = false;
@@ skipping 402 matching lines @@
 
   if (web_cdm_) {
     decryptor_ready_cb.Run(web_cdm_->GetDecryptor());
     return;
   }
 
   decryptor_ready_cb_ = decryptor_ready_cb;
 }
 
 }  // namespace content