Move VideoDecoder out of media pipeline.

media/base/filters.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.
 
 // Filters are connected in a strongly typed manner, with downstream filters
 // always reading data from upstream filters.  Upstream filters have no clue
 // who is actually reading from them, and return the results via callbacks.
 //
 //                         DemuxerStream(Video) <- VideoDecoder <- VideoRenderer
 // DataSource <- Demuxer <
@@ skipping 146 matching lines @@
   // PipelineImpl::Stop() goes through a Pause/Flush/Stop dance to all its
   // filters, waiting for each state transition to complete before starting the
   // next, but WebMediaPlayerImpl::Destroy() holds the renderer loop hostage for
   // the duration.  Default implementation does nothing; derived decoders may
   // override as needed.  http://crbug.com/110228 tracks removing this.
   virtual void PrepareForShutdownHack();
 
  protected:
   VideoDecoder();
   virtual ~VideoDecoder();
+
+ private:
+  // These functions will be removed later. Declare here to make sure they are
+  // not called from VideoDecoder interface anymore.
+  // TODO(xhwang): Remove them when VideoDecoder is not a Filter any more.

[Ami GONE FROM CHROMIUM, 2012/03/14 22:42:50]

Include the crbug # in the TODO

[xhwang, 2012/03/14 22:59:42]

Done.

+  virtual void Play(const base::Closure& callback) OVERRIDE;
+  virtual void Pause(const base::Closure& callback) OVERRIDE;
+  virtual void Seek(base::TimeDelta time,
+                    const FilterStatusCB& callback) OVERRIDE;
 };
 
-
 class MEDIA_EXPORT VideoRenderer : public Filter {
  public:
   // Used to update the pipeline's clock time. The parameter is the time that
   // the clock should not exceed.
   typedef base::Callback<void(base::TimeDelta)> VideoTimeCB;
 
   // Initialize a VideoRenderer with the given VideoDecoder, executing the
   // callback upon completion.
-  virtual void Initialize(VideoDecoder* decoder,
-                          const PipelineStatusCB& callback,
+  virtual void Initialize(const scoped_refptr<VideoDecoder>& decoder,
+                          const PipelineStatusCB& pipeline_status_cb,
                           const StatisticsCB& statistics_cb,
                           const VideoTimeCB& time_cb) = 0;
 
   // Returns true if this filter has received and processed an end-of-stream
   // buffer.
   virtual bool HasEnded() = 0;
 };
 
-
 class MEDIA_EXPORT AudioRenderer : public Filter {
  public:
   // Used to update the pipeline's clock time. The first parameter is the
   // current time, and the second parameter is the time that the clock must not
   // exceed.
   typedef base::Callback<void(base::TimeDelta, base::TimeDelta)> AudioTimeCB;
 
   // Initialize a AudioRenderer with the given AudioDecoder, executing the
   // |init_callback| upon completion. |underflow_callback| is called when the
   // renderer runs out of data to pass to the audio card during playback.
@@ skipping 14 matching lines @@
 
   // Resumes playback after underflow occurs.
   // |buffer_more_audio| is set to true if you want to increase the size of the
   // decoded audio buffer.
   virtual void ResumeAfterUnderflow(bool buffer_more_audio) = 0;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_FILTERS_H_