Merge FilterStatusCB into PipelineStatusCB.

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 27 matching lines @@
 
 namespace media {
 
 class AudioDecoder;
 class Buffer;
 class Decoder;
 class DemuxerStream;
 class Filter;
 class FilterHost;
 
-struct PipelineStatistics;
-
-// Used for completing asynchronous methods.
-typedef base::Callback<void(PipelineStatus)> FilterStatusCB;
-
 // These functions copy |*cb|, call Reset() on |*cb|, and then call Run()
 // on the copy.  This is used in the common case where you need to clear
 // a callback member variable before running the callback.
-MEDIA_EXPORT void ResetAndRunCB(FilterStatusCB* cb, PipelineStatus status);
+MEDIA_EXPORT void ResetAndRunCB(PipelineStatusCB* cb, PipelineStatus status);
 MEDIA_EXPORT void ResetAndRunCB(base::Closure* cb);
 

[xhwang, 2012/03/17 16:41:27]

Keep declarations of ResetAndRunCB here since fischman@ is working on a solution
to move them to base/.

 class MEDIA_EXPORT Filter : public base::RefCountedThreadSafe<Filter> {
  public:
   Filter();
 
   // Sets the private member |host_|. This is the first method called by
   // the FilterHost after a filter is created.  The host holds a strong
   // reference to the filter.  The reference held by the host is guaranteed
   // to be released before the host object is destroyed by the pipeline.
   virtual void set_host(FilterHost* host);
 
@@ skipping 22 matching lines @@
   // the client called Stop().
   // TODO(boliu): Check that callback is not NULL in subclasses.
   virtual void Stop(const base::Closure& callback);
 
   // The pipeline playback rate has been changed.  Filters may implement this
   // method if they need to respond to this call.
   virtual void SetPlaybackRate(float playback_rate);
 
   // Carry out any actions required to seek to the given time, executing the
   // callback upon completion.
-  virtual void Seek(base::TimeDelta time, const FilterStatusCB& callback);
+  virtual void Seek(base::TimeDelta time, const PipelineStatusCB& callback);
 
   // This method is called from the pipeline when the audio renderer
   // is disabled. Filters can ignore the notification if they do not
   // need to react to this event.
   virtual void OnAudioRendererDisabled();
 
  protected:
   // Only allow scoped_refptr<> to delete filters.
   friend class base::RefCountedThreadSafe<Filter>;
   virtual ~Filter();
@@ skipping 101 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_