Revert 194993 "Remove reference counting from media::VideoDecode..."

trunk/src/media/base/filter_collection.h

Index: trunk/src/media/base/filter_collection.h
===================================================================
--- trunk/src/media/base/filter_collection.h	(revision 195011)
+++ trunk/src/media/base/filter_collection.h	(working copy)
@@ -5,6 +5,8 @@
 #ifndef MEDIA_BASE_FILTER_COLLECTION_H_
 #define MEDIA_BASE_FILTER_COLLECTION_H_
 
+#include <list>
+
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
@@ -13,6 +15,7 @@
 
 class AudioRenderer;
 class Demuxer;
+class VideoDecoder;
 class VideoRenderer;
 
 // Represents a set of uninitialized demuxer and audio/video decoders and
@@ -22,6 +25,8 @@
 // http://crbug.com/110800
 class MEDIA_EXPORT FilterCollection {
  public:
+  typedef std::list<scoped_refptr<VideoDecoder> > VideoDecoderList;
+
   FilterCollection();
   ~FilterCollection();
 
@@ -34,8 +39,11 @@
   void SetVideoRenderer(scoped_ptr<VideoRenderer> video_renderer);
   scoped_ptr<VideoRenderer> GetVideoRenderer();
 
+  VideoDecoderList* GetVideoDecoders();
+
  private:
   scoped_refptr<Demuxer> demuxer_;
+  VideoDecoderList video_decoders_;
   scoped_ptr<AudioRenderer> audio_renderer_;
   scoped_ptr<VideoRenderer> video_renderer_;
 
Property changes on: trunk/src/media/base/filter_collection.h
___________________________________________________________________
Deleted: svn:mergeinfo