Move VideoDecoder out of media pipeline.

media/base/filter_collection.h

Index: media/base/filter_collection.h
diff --git a/media/base/filter_collection.h b/media/base/filter_collection.h
index 12a3a2fc9f6b79dd04d9e68d7f43e7efbb2fd4e7..abbd750bc00321aa92fa2e4199610c1fa0ae3f03 100644
--- a/media/base/filter_collection.h
+++ b/media/base/filter_collection.h
@@ -27,7 +27,7 @@ class MEDIA_EXPORT FilterCollection {
   DemuxerFactory* GetDemuxerFactory();
 
   // Adds a filter to the collection.
-  void AddVideoDecoder(VideoDecoder* filter);
+  void AddVideoDecoder(VideoDecoder* video_decoder);
   void AddAudioDecoder(AudioDecoder* audio_decoder);
   void AddVideoRenderer(VideoRenderer* filter);
   void AddAudioRenderer(AudioRenderer* filter);
@@ -42,7 +42,7 @@ class MEDIA_EXPORT FilterCollection {
   // If the required filter cannot be found, NULL is returned.
   // If a filter is returned it is removed from the collection.
   // Filters are selected in FIFO order.
-  void SelectVideoDecoder(scoped_refptr<VideoDecoder>* filter_out);
+  void SelectVideoDecoder(scoped_refptr<VideoDecoder>* out);
   void SelectAudioDecoder(scoped_refptr<AudioDecoder>* out);
   void SelectVideoRenderer(scoped_refptr<VideoRenderer>* filter_out);
   void SelectAudioRenderer(scoped_refptr<AudioRenderer>* filter_out);
@@ -52,7 +52,6 @@ class MEDIA_EXPORT FilterCollection {
   // the following types. This is used to mark, identify, and support
   // downcasting of different filter types stored in the filters_ list.
   enum FilterType {
-    VIDEO_DECODER,
     AUDIO_RENDERER,
     VIDEO_RENDERER,
   };
@@ -62,6 +61,7 @@ class MEDIA_EXPORT FilterCollection {
   typedef std::list<FilterListElement> FilterList;
   FilterList filters_;
   scoped_ptr<DemuxerFactory> demuxer_factory_;
+  std::list<scoped_refptr<VideoDecoder> > video_decoders_;

[Ami GONE FROM CHROMIUM, 2012/03/14 20:05:01]

nit: IWBN to have _V_ideoDecoders follow _A_udio_decoders (here and in various
other places in this CL) to be lexicographically sorted.

[xhwang, 2012/03/14 22:28:41]

Done.

   std::list<scoped_refptr<AudioDecoder> > audio_decoders_;
 
   // Helper function that adds a filter to the filter list.