Move Demuxer::set_host() to Initialize().

media/filters/ffmpeg_demuxer.h

 // Copyright (c) 2012 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 121 matching lines @@
  public:
   FFmpegDemuxer(MessageLoop* message_loop,
                 const scoped_refptr<DataSource>& data_source,
                 bool local_source);
   virtual ~FFmpegDemuxer();
 
   // Posts a task to perform additional demuxing.
   virtual void PostDemuxTask();
 
   // Demuxer implementation.
-  virtual void set_host(DemuxerHost* demuxer_host) OVERRIDE;
-  virtual void Initialize(const PipelineStatusCB& status_cb) OVERRIDE;
+  virtual void Initialize(DemuxerHost* host,
+                          const PipelineStatusCB& status_cb) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
   virtual void OnAudioRendererDisabled() OVERRIDE;
   virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
   virtual scoped_refptr<DemuxerStream> GetStream(
       DemuxerStream::Type type) OVERRIDE;
   virtual base::TimeDelta GetStartTime() const OVERRIDE;
   virtual int GetBitrate() OVERRIDE;
   virtual bool IsLocalSource() OVERRIDE;
   virtual bool IsSeekable() OVERRIDE;
@@ skipping 10 matching lines @@
 
   // For testing purposes.
   void disable_first_seek_hack_for_testing() { first_seek_hack_ = false; }
 
  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(const PipelineStatusCB& status_cb);
+  void InitializeTask(DemuxerHost* host, const PipelineStatusCB& status_cb);
 
   // Carries out a seek on the demuxer thread.
   void SeekTask(base::TimeDelta time, const PipelineStatusCB& cb);
 
   // 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(const base::Closure& callback);
 
@@ skipping 12 matching lines @@
   // Must be called on the demuxer thread.
   void StreamHasEnded();
 
   // Wait for asynchronous read to complete and return number of bytes read.
   virtual int WaitForRead();
 
   // Signal the blocked thread that the read has completed, with |size| bytes
   // read or kReadError in case of error.
   virtual void SignalReadCompleted(int size);
 
+  DemuxerHost* host_;
+
   MessageLoop* message_loop_;
 
   // True if the media is a local resource, false if the media require network
   // access to be loaded.
   bool local_source_;
 
   // FFmpeg context handle.
   AVFormatContext* format_context_;
 
   // |streams_| mirrors the AVStream array in |format_context_|. It contains
@@ skipping 39 matching lines @@
   // Whether audio has been disabled for this demuxer (in which case this class
   // drops packets destined for AUDIO demuxer streams on the floor).
   bool audio_disabled_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_