Demuxer stream now uses a callback instead of Assignable template. Cleaning ...

media/filters/ffmpeg_demuxer.h

 // Copyright (c) 2009 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.
 
 // Implements the Demuxer interface using FFmpeg's libavformat.  At this time
 // will support demuxing any audio/video format thrown at it.  The streams
 // output mime types audio/x-ffmpeg and video/x-ffmpeg and include an integer
 // key FFmpegCodecID which contains the CodecID enumeration value.  The CodecIDs
 // can be used to create and initialize the corresponding FFmpeg decoder.
 //
@@ skipping 40 matching lines @@
   bool HasPendingReads();
 
   // Enqueues and takes ownership over the given AVPacket.
   void EnqueuePacket(AVPacket* packet);
 
   // Returns the duration of this stream.
   base::TimeDelta duration() { return duration_; }
 
   // DemuxerStream implementation.
   virtual const MediaFormat& media_format();
-  virtual void Read(Assignable<Buffer>* buffer);
+  virtual void Read(Callback1<Buffer*>::Type* read_callback);
 
   AVStream* av_stream() {
     return av_stream_;
   }
 
   static const char* interface_id();
 
  protected:
   virtual void* QueryInterface(const char* interface_id);
 
  private:
   // Returns true if there are still pending reads.
   bool FulfillPendingReads();
 
   FFmpegDemuxer* demuxer_;
   AVStream* av_stream_;
   MediaFormat media_format_;
   base::TimeDelta time_base_;
   base::TimeDelta duration_;
   Lock lock_;
 
-  typedef std::deque< scoped_refptr<Buffer> > InputQueue;
-  InputQueue input_queue_;
+  typedef std::deque< scoped_refptr<Buffer> > BufferQueue;
+  BufferQueue buffer_queue_;
 
-  typedef std::deque< scoped_refptr< Assignable<Buffer> > > OutputQueue;
-  OutputQueue output_queue_;
+  typedef std::deque<Callback1<Buffer*>::Type*> ReadQueue;
+  ReadQueue read_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxerStream);
 };
 
 class FFmpegDemuxer : public Demuxer {
  public:
   // FilterFactory provider.
   static FilterFactory* CreateFilterFactory() {
     return new FilterFactoryImpl0<FFmpegDemuxer>();
   }
@@ skipping 30 matching lines @@
   // Vector of streams.
   typedef std::vector< scoped_refptr<FFmpegDemuxerStream> > StreamVector;
   StreamVector streams_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_