Removing DataSource from Filter hierarchy

media/base/pipeline_impl.h

 // Copyright (c) 2011 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.
 
 // Implementation of Pipeline & PipelineStatusNotification (an async-to-sync
 // callback adapter).
 
 #ifndef MEDIA_BASE_PIPELINE_IMPL_H_
 #define MEDIA_BASE_PIPELINE_IMPL_H_
 
@@ skipping 78 matching lines @@
 // Initialization is a series of state transitions from "Created" through each
 // filter initialization state.  When all filter initialization states have
 // completed, we are implicitly in a "Paused" state.  At that point we simulate
 // a Seek() to the beginning of the media to give filters a chance to preroll.
 // From then on the normal Seek() transitions are carried out and we start
 // playing the media.
 //
 // If any error ever happens, this object will transition to the "Error" state
 // from any state. If Stop() is ever called, this object will transition to
 // "Stopped" state.
-class MEDIA_EXPORT PipelineImpl : public Pipeline, public FilterHost {
+class MEDIA_EXPORT PipelineImpl
+    : public Pipeline,
+      public FilterHost,
+      public DemuxerHost {
  public:
   explicit PipelineImpl(MessageLoop* message_loop, MediaLog* media_log);
 
   // Pipeline implementation.
   virtual void Init(const PipelineStatusCB& ended_callback,
                     const PipelineStatusCB& error_callback,
                     const NetworkEventCB& network_callback) OVERRIDE;
   virtual bool Start(FilterCollection* filter_collection,
                      const std::string& uri,
                      const PipelineStatusCB& start_callback) OVERRIDE;
@@ skipping 73 matching lines @@
   // initialization.
   void FinishInitialization();
 
   // Returns true if the given state is one that transitions to a new state
   // after iterating through each filter.
   static bool TransientState(State state);
 
   // Given the current state, returns the next state.
   State FindNextState(State current);
 
+  // DataSourceHost implementation.

[Ami GONE FROM CHROMIUM, 2011/12/15 18:39:08]

s/DataSourceHost/DataSourceHost (by way of DemuxerHost)/

[acolwell GONE FROM CHROMIUM, 2011/12/15 20:57:59]

Done.

+  virtual void SetTotalBytes(int64 total_bytes) OVERRIDE;
+  virtual void SetBufferedBytes(int64 buffered_bytes) OVERRIDE;
+  virtual void SetNetworkActivity(bool is_downloading_data) OVERRIDE;
+
+  // DemuxerHost implementaion.
+  virtual void SetDuration(base::TimeDelta duration) OVERRIDE;
+  virtual void SetBufferedTime(base::TimeDelta buffered_time) OVERRIDE;
+  virtual void SetCurrentReadPosition(int64 offset) OVERRIDE;
+  virtual void OnDemuxerError(PipelineStatus error) OVERRIDE;
+
   // FilterHost implementation.
   virtual void SetError(PipelineStatus error) OVERRIDE;
   virtual base::TimeDelta GetTime() const OVERRIDE;
   virtual base::TimeDelta GetDuration() const OVERRIDE;
   virtual void SetTime(base::TimeDelta time) OVERRIDE;
-  virtual void SetDuration(base::TimeDelta duration) OVERRIDE;
-  virtual void SetBufferedTime(base::TimeDelta buffered_time) OVERRIDE;
-  virtual void SetTotalBytes(int64 total_bytes) OVERRIDE;
-  virtual void SetBufferedBytes(int64 buffered_bytes) OVERRIDE;
   virtual void SetNaturalVideoSize(const gfx::Size& size) OVERRIDE;
-  virtual void SetNetworkActivity(bool is_downloading_data) OVERRIDE;
   virtual void NotifyEnded() OVERRIDE;
   virtual void DisableAudioRenderer() OVERRIDE;
-  virtual void SetCurrentReadPosition(int64 offset) OVERRIDE;
-  virtual int64 GetCurrentReadPosition() OVERRIDE;
 
   // Callbacks executed by filters upon completing initialization.
   void OnFilterInitialize(PipelineStatus status);
 
   // Callback executed by filters upon completing Play(), Pause(), or Stop().
   void OnFilterStateTransition();
 
   // Callback executed by filters upon completing Seek().
   void OnFilterStateTransitionWithStatus(PipelineStatus status);
 
@@ skipping 276 matching lines @@
   bool is_downloading_data_;
 
   FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, GetBufferedTime);
 
   DISALLOW_COPY_AND_ASSIGN(PipelineImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_PIPELINE_IMPL_H_