Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

media/base/filters.h

 // Copyright (c) 2010 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 22 matching lines @@
 #include "media/base/media_format.h"
 #include "media/base/video_frame.h"
 
 class MessageLoop;
 
 namespace media {
 
 class Buffer;
 class Decoder;
 class DemuxerStream;
+class Filter;
 class FilterHost;
-class MediaFilter;
 
 // Used for completing asynchronous methods.
 typedef Callback0::Type FilterCallback;
 
-class MediaFilter : public base::RefCountedThreadSafe<MediaFilter> {
+class Filter : public base::RefCountedThreadSafe<Filter> {
  public:
-  MediaFilter();
+  Filter();
 
   // Return the major mime type for this filter.
   virtual const char* major_mime_type() const;
 
   // 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 41 matching lines @@
   // callback upon completion.
   virtual void Seek(base::TimeDelta time, FilterCallback* 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<MediaFilter>;
-  virtual ~MediaFilter();
+  friend class base::RefCountedThreadSafe<Filter>;
+  virtual ~Filter();
 
   FilterHost* host() const { return host_; }
   MessageLoop* message_loop() const { return message_loop_; }
 
  private:
   FilterHost* host_;
   MessageLoop* message_loop_;
 
-  DISALLOW_COPY_AND_ASSIGN(MediaFilter);
+  DISALLOW_COPY_AND_ASSIGN(Filter);
 };
 
-class DataSource : public MediaFilter {
+class DataSource : public Filter {
  public:
   typedef Callback1<size_t>::Type ReadCallback;
   static const size_t kReadError = static_cast<size_t>(-1);
 
   virtual bool IsUrlSupported(const std::string& url);
 
   // Initialize a DataSource for the given URL, executing the callback upon
   // completion.
   virtual void Initialize(const std::string& url, FilterCallback* callback) = 0;
 
   // Reads |size| bytes from |position| into |data|. And when the read is done
   // or failed, |read_callback| is called with the number of bytes read or
   // kReadError in case of error.
   // TODO(hclam): should change |size| to int! It makes the code so messy
   // with size_t and int all over the place..
   virtual void Read(int64 position, size_t size,
                     uint8* data, ReadCallback* read_callback) = 0;
 
   // Returns true and the file size, false if the file size could not be
   // retrieved.
   virtual bool GetSize(int64* size_out) = 0;
 
   // Returns true if we are performing streaming. In this case seeking is
   // not possible.
   virtual bool IsStreaming() = 0;
 };
 
 
-class Demuxer : public MediaFilter {
+class Demuxer : public Filter {
  public:
   virtual bool requires_message_loop() const;
   virtual const char* message_loop_name() const;
 
   // Initialize a Demuxer with the given DataSource, executing the callback upon
   // completion.
   virtual void Initialize(DataSource* data_source,
                           FilterCallback* callback) = 0;
 
   // Returns the number of streams available
@@ skipping 35 matching lines @@
   // return NULL to indicate the interface is unknown.  The derived filter
   // should NOT AddRef() the interface.  The DemuxerStream::QueryInterface()
   // public template function will assign the interface to a scoped_refptr<>.
   virtual void* QueryInterface(const char* interface_id) { return NULL; }
 
   friend class base::RefCountedThreadSafe<DemuxerStream>;
   virtual ~DemuxerStream();
 };
 
 
-class VideoDecoder : public MediaFilter {
+class VideoDecoder : public Filter {
  public:
   virtual const char* major_mime_type() const;
   virtual bool requires_message_loop() const;
   virtual const char* message_loop_name() const;
 
 
   // Initialize a VideoDecoder with the given DemuxerStream, executing the
   // callback upon completion.
   virtual void Initialize(DemuxerStream* stream, FilterCallback* callback) = 0;
 
@@ skipping 24 matching lines @@
   }
 
   VideoDecoder();
   virtual ~VideoDecoder();
 
  private:
   scoped_ptr<ConsumeVideoFrameCallback> consume_video_frame_callback_;
 };
 
 
-class AudioDecoder : public MediaFilter {
+class AudioDecoder : public Filter {
  public:
   virtual const char* major_mime_type() const;
   virtual bool requires_message_loop() const;
   virtual const char* message_loop_name() const;
 
   // Initialize a AudioDecoder with the given DemuxerStream, executing the
   // callback upon completion.
   virtual void Initialize(DemuxerStream* stream, FilterCallback* callback) = 0;
 
   // |set_fill_buffer_done_callback| install permanent callback from downstream
@@ skipping 18 matching lines @@
 
  protected:
   AudioDecoder();
   ~AudioDecoder();
 
  private:
   scoped_ptr<ConsumeAudioSamplesCallback> consume_audio_samples_callback_;
 };
 
 
-class VideoRenderer : public MediaFilter {
+class VideoRenderer : public Filter {
  public:
   virtual const char* major_mime_type() const;
 
   // Initialize a VideoRenderer with the given VideoDecoder, executing the
   // callback upon completion.
   virtual void Initialize(VideoDecoder* decoder, FilterCallback* callback) = 0;
 
   // Returns true if this filter has received and processed an end-of-stream
   // buffer.
   virtual bool HasEnded() = 0;
 };
 
 
-class AudioRenderer : public MediaFilter {
+class AudioRenderer : public Filter {
  public:
   virtual const char* major_mime_type() const;
 
   // Initialize a AudioRenderer with the given AudioDecoder, executing the
   // callback upon completion.
   virtual void Initialize(AudioDecoder* decoder, FilterCallback* callback) = 0;
 
   // Returns true if this filter has received and processed an end-of-stream
   // buffer.
   virtual bool HasEnded() = 0;
 
   // Sets the output volume.
   virtual void SetVolume(float volume) = 0;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_FILTERS_H_