Remove DemuxerFactory and URL parameter from Pipeline.

webkit/media/buffered_data_source.h

 // Copyright (c) 2012 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 WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
 #define WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/data_source.h"
 #include "media/base/pipeline_status.h"
 #include "webkit/media/buffered_resource_loader.h"
+#include "webkit/media/preload.h"
 
 class MessageLoop;
 
 namespace media {
 class MediaLog;
 }
 
 namespace webkit_media {
 
 // A data source capable of loading URLs and buffering the data using an
 // in-memory sliding window.
 //
 // BufferedDataSource must be created and initialized on the render thread
 // before being passed to other threads. It may be deleted on any thread.
 class BufferedDataSource : public media::DataSource {
  public:
   BufferedDataSource(MessageLoop* render_loop,
                      WebKit::WebFrame* frame,
                      media::MediaLog* media_log);
 
   virtual ~BufferedDataSource();
 
   // Initialize this object using |url|. This object calls |status_cb| when
   // initialization has completed.
   //
   // Method called on the render thread.
   void Initialize(const GURL& url,
                   const media::PipelineStatusCB& status_cb);
 
+  // Adjusts the buffering algorithm based on the given preload value.
+  void SetPreload(Preload preload);
+
   // Returns true if the media resource has a single origin, false otherwise.
   // Only valid to call after Initialize() has completed.
   //
   // Method called on the render thread.
   bool HasSingleOrigin();
 
   // Cancels initialization, any pending loaders, and any pending read calls
   // from the demuxer. The caller is expected to release its reference to this
   // object and never call it again.
   //
   // Method called on the render thread.
   void Abort();
 
   // media::DataSource implementation.
   // Called from demuxer thread.
   virtual void set_host(media::DataSourceHost* host) OVERRIDE;
   virtual void Stop(const base::Closure& closure) OVERRIDE;
   virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
 
   virtual void Read(int64 position, int size, uint8* data,
                     const media::DataSource::ReadCB& read_cb) OVERRIDE;
   virtual bool GetSize(int64* size_out) OVERRIDE;
   virtual bool IsStreaming() OVERRIDE;
-  virtual void SetPreload(media::Preload preload) OVERRIDE;
   virtual void SetBitrate(int bitrate) OVERRIDE;
 
  protected:
   // A factory method to create a BufferedResourceLoader based on the read
   // parameters. We can override this file to object a mock
   // BufferedResourceLoader for testing.
   virtual BufferedResourceLoader* CreateResourceLoader(
       int64 first_byte_position, int64 last_byte_position);
 
  private:
   friend class BufferedDataSourceTest;
 
   // Task posted to perform actual reading on the render thread.
   void ReadTask(int64 position, int read_size, uint8* read_buffer);
 
   // Task posted when Stop() is called. Stops |watch_dog_timer_| and
   // |loader_|, reset Read() variables, and set |stopped_on_render_loop_|
   // to signal any remaining tasks to stop.
   void CleanupTask();
 
   // Restart resource loading on render thread.
   void RestartLoadingTask();
 
   // This task uses the current playback rate with the previous playback rate
   // to determine whether we are going from pause to play and play to pause,
   // and signals the buffered resource loader accordingly.
   void SetPlaybackRateTask(float playback_rate);
 
-  // This task saves the preload value for the media.
-  void SetPreloadTask(media::Preload preload);
-
   // Tells |loader_| the bitrate of the media.
   void SetBitrateTask(int bitrate);
 
   // Decides which DeferStrategy to used based on the current state of the
   // BufferedDataSource.
   BufferedResourceLoader::DeferStrategy ChooseDeferStrategy();
 
   // The method that performs actual read. This method can only be executed on
   // the render thread.
   void ReadInternal();
@@ skipping 93 matching lines @@
   // This variable is true when we are in a paused state and false when we
   // are in a playing state.
   bool media_is_paused_;
 
   // This variable is true when the user has requested the video to play at
   // least once.
   bool media_has_played_;
 
   // This variable holds the value of the preload attribute for the video
   // element.
-  media::Preload preload_;
+  Preload preload_;
 
   // Number of cache miss retries left.
   int cache_miss_retries_left_;
 
   // Bitrate of the content, 0 if unknown.
   int bitrate_;
 
   // Current playback rate.
   float playback_rate_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_