DemuxerFactory is born!

media/filters/ffmpeg_demuxer.h

Index: media/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index 21235638e49274a5fa89c3dfbc9537673c84097f..cd677e446364de847d4b82a95901e649e71a00f1 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -131,9 +131,11 @@ class FFmpegDemuxer : public Demuxer,
   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);
 
@@ -153,7 +155,8 @@ class FFmpegDemuxer : public Demuxer,
   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);
@@ -226,6 +229,11 @@ class FFmpegDemuxer : public Demuxer,
   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);
 };