Move DataSourceHost to BufferedDataSourceHost.

content/renderer/media/webmediaplayer_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
+#include "content/renderer/media/buffered_data_source.h"
 #include "content/renderer/media/crypto/proxy_decryptor.h"
 #include "content/renderer/media/video_frame_compositor.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/decryptor.h"
 // TODO(xhwang): Remove when we remove prefixed EME implementation.
 #include "media/base/media_keys.h"
 #include "media/base/pipeline.h"
 #include "media/base/text_track.h"
 #include "media/filters/skcanvas_video_renderer.h"
 #include "skia/ext/platform_canvas.h"
@@ skipping 31 matching lines @@
 class WebContentDecryptionModuleImpl;
 class WebMediaPlayerDelegate;
 class WebMediaPlayerParams;
 class WebTextTrackImpl;
 
 // The canonical implementation of blink::WebMediaPlayer that's backed by
 // media::Pipeline. Handles normal resource loading, Media Source, and
 // Encrypted Media.
 class WebMediaPlayerImpl
     : public blink::WebMediaPlayer,
+      public BufferedDataSourceHost,
       public base::SupportsWeakPtr<WebMediaPlayerImpl> {
  public:
   // Constructs a WebMediaPlayer implementation using Chromium's media stack.
   // |delegate| may be null.
   WebMediaPlayerImpl(
       blink::WebFrame* frame,
       blink::WebMediaPlayerClient* client,
       base::WeakPtr<WebMediaPlayerDelegate> delegate,
       const WebMediaPlayerParams& params);
   virtual ~WebMediaPlayerImpl();
@@ skipping 72 matching lines @@
                                    unsigned init_data_length,
                                    const blink::WebString& session_id);
 
   virtual MediaKeyException cancelKeyRequest(
       const blink::WebString& key_system,
       const blink::WebString& session_id);
 
   virtual void setContentDecryptionModule(
       blink::WebContentDecryptionModule* cdm);
 
+  // BufferedDataSourceHost implementation.
+  virtual void SetTotalBytes(int64 total_bytes) OVERRIDE;
+  virtual void AddBufferedByteRange(int64 start, int64 end) OVERRIDE;
+
   // Notifies blink that the entire media element region has been invalidated.
   // This path is slower than notifying the compositor directly as it performs
   // more work and can trigger layouts. It should only be used in two cases:
   //   1) Major state changes (e.g., first frame available, run time error
   //      occured)
   //   2) Compositing not available
   void InvalidateOnMainThread();
 
   void OnPipelineSeek(media::PipelineStatus status);
   void OnPipelineEnded();
@@ skipping 68 matching lines @@
   // If |decryptor_ready_cb| is null, the existing callback will be fired with
   // NULL immediately and reset.
   void SetDecryptorReadyCB(const media::DecryptorReadyCB& decryptor_ready_cb);
 
   blink::WebFrame* frame_;
 
   // TODO(hclam): get rid of these members and read from the pipeline directly.
   blink::WebMediaPlayer::NetworkState network_state_;
   blink::WebMediaPlayer::ReadyState ready_state_;
 
-  // Keep a list of buffered time ranges.
-  blink::WebTimeRanges buffered_;
-
   // Message loops for posting tasks on Chrome's main thread. Also used
   // for DCHECKs so methods calls won't execute in the wrong thread.
   const scoped_refptr<base::MessageLoopProxy> main_loop_;
 
   scoped_refptr<base::MessageLoopProxy> media_loop_;
   scoped_refptr<media::MediaLog> media_log_;
   media::Pipeline pipeline_;
 
   // The currently selected key system. Empty string means that no key system
   // has been selected.
   std::string current_key_system_;
 
   // The LoadType passed in the |load_type| parameter of the load() call.
   LoadType load_type_;
 
   // Cache of metadata for answering hasAudio(), hasVideo(), and naturalSize().
   media::PipelineMetadata pipeline_metadata_;
 
+  // TODO(sandersd): comment.
+  int64 total_bytes_;

[scherkus (not reviewing), 2014/04/03 21:59:37]

nit: I'd stash all these variables together around line ~338 since they're only
used/valid when data_source_ != NULL (except for buffered_ -- you might as well
leave that where it was in the original code on line ~248)

[sandersd (OOO until July 31), 2014/04/04 23:48:41]

Done.

+
+  // List of buffered byte ranges for estimating buffered time.
+  media::Ranges<int64> buffered_byte_ranges_;
+
+  // TODO(sandersd): comment.
+  blink::WebTimeRanges buffered_;
+
+  // True when AddBufferedByteRange() has been called more recently than
+  // didLoadingProgress().
+  mutable bool did_loading_progress_;
+
   // Playback state.
   //
   // TODO(scherkus): we have these because Pipeline favours the simplicity of a
   // single "playback rate" over worrying about paused/stopped etc...  It forces
   // all clients to manage the pause+playback rate externally, but is that
   // really a bad thing?
   //
   // TODO(scherkus): since SetPlaybackRate(0) is asynchronous and we don't want
   // to hang the render thread during pause(), we record the time at the same
   // time we pause and then return that value in currentTime().  Otherwise our
@@ skipping 65 matching lines @@
   WebContentDecryptionModuleImpl* web_cdm_;
 
   media::DecryptorReadyCB decryptor_ready_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_