DemuxerFactory is born!

media/filters/ffmpeg_demuxer.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.
 
 // 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 113 matching lines @@
   explicit FFmpegDemuxer(MessageLoop* message_loop);
   virtual ~FFmpegDemuxer();
 
   // Posts a task to perform additional demuxing.
   virtual void PostDemuxTask();
 
   // Filter implementation.
   virtual void Stop(FilterCallback* callback);
   virtual void Seek(base::TimeDelta time, FilterCallback* callback);
   virtual void OnAudioRendererDisabled();
+  virtual void set_host(FilterHost* filter_host);
 
   // Demuxer implementation.
-  virtual void Initialize(DataSource* data_source, FilterCallback* callback);
+  virtual void Initialize(

[acolwell GONE FROM CHROMIUM, 2011/03/08 21:48:09]

Consider moving this before the Demuxer & Filter implementation comments since
Initialize() isn't part of the Demuxer interface anymore.

Does Initialize() still need to be virtual?

[Ami GONE FROM CHROMIUM, 2011/03/08 22:44:48]

Done.
Nope.  Done.

+      DataSource* data_source, PipelineStatusCallback* callback);
   virtual size_t GetNumberOfStreams();
   virtual scoped_refptr<DemuxerStream> GetStream(int stream_id);
 
   // FFmpegProtocol implementation.
   virtual int Read(int size, uint8* data);
   virtual bool GetPosition(int64* position_out);
   virtual bool SetPosition(int64 position);
   virtual bool GetSize(int64* size_out);
   virtual bool IsStreaming();
 
   // Provide access to FFmpegDemuxerStream.
   MessageLoop* message_loop();
 
  private:
   // Only allow a factory to create this class.
   friend class MockFFmpegDemuxer;
   FRIEND_TEST_ALL_PREFIXES(FFmpegDemuxerTest, ProtocolRead);
 
   // Carries out initialization on the demuxer thread.
-  void InitializeTask(DataSource* data_source, FilterCallback* callback);
+  void InitializeTask(
+      DataSource* data_source, PipelineStatusCallback* callback);
 
   // Carries out a seek on the demuxer thread.
   void SeekTask(base::TimeDelta time, FilterCallback* callback);
 
   // Carries out demuxing and satisfying stream reads on the demuxer thread.
   void DemuxTask();
 
   // Carries out stopping the demuxer streams on the demuxer thread.
   void StopTask(FilterCallback* callback);
 
@@ skipping 52 matching lines @@
   // signaled when the demuxer is being stopped.
   base::WaitableEvent read_event_;
 
   // Flag to indicate if read has ever failed. Once set to true, it will
   // never be reset. This flag is set true and accessed in Read().
   bool read_has_failed_;
 
   size_t last_read_bytes_;
   int64 read_position_;
 
+  // Initialization can happen before set_host() is called, in which case we
+  // store these bits for deferred reporting to the FilterHost when we get one.
+  base::TimeDelta max_duration_;
+  PipelineError deferred_status_;
+
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_