Move VideoDecoder initialization into VideoRendererBase.

media/filters/video_renderer_base.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.
 
 #ifndef MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_
 #define MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_
 
 #include <deque>
 
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"
+#include "media/base/demuxer_stream.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/video_decoder.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_renderer.h"
 
 namespace media {
 
 // VideoRendererBase creates its own thread for the sole purpose of timing frame
 // presentation.  It handles reading from the decoder and stores the results in
 // a queue of decoded frames and executing a callback when a frame is ready for
@@ skipping 19 matching lines @@
   //
   // Setting |drop_frames_| to true causes the renderer to drop expired frames.
   //
   // TODO(scherkus): pass the VideoFrame* to this callback and remove
   // Get/PutCurrentFrame() http://crbug.com/108435
   VideoRendererBase(const base::Closure& paint_cb,
                     const SetOpaqueCB& set_opaque_cb,
                     bool drop_frames);
 
   // VideoRenderer implementation.
-  virtual void Initialize(const scoped_refptr<VideoDecoder>& decoder,
+  virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
+                          const VideoDecoderList& decoders,
                           const PipelineStatusCB& init_cb,
                           const StatisticsCB& statistics_cb,
                           const TimeCB& max_time_cb,
                           const NaturalSizeChangedCB& size_changed_cb,
                           const base::Closure& ended_cb,
                           const PipelineStatusCB& error_cb,
                           const TimeDeltaCB& get_time_cb,
                           const TimeDeltaCB& get_duration_cb) OVERRIDE;
   virtual void Play(const base::Closure& callback) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
   virtual void Preroll(base::TimeDelta time,
                        const PipelineStatusCB& cb) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
   virtual bool HasEnded() OVERRIDE;
+  virtual void PrepareForShutdownHack() OVERRIDE;
 
   // PlatformThread::Delegate implementation.
   virtual void ThreadMain() OVERRIDE;
 
   // Clients of this class (painter/compositor) should use GetCurrentFrame()
   // obtain ownership of VideoFrame, it should always relinquish the ownership
   // by use PutCurrentFrame(). Current frame is not guaranteed to be non-NULL.
   // It expects clients to use color-fill the background if current frame
   // is NULL. This could happen before pipeline is pre-rolled or during
   // pause/flush/preroll.
@@ skipping 33 matching lines @@
   // Helper function that flushes the buffers when a Stop() or error occurs.
   void DoStopOrError_Locked();
 
   // Return the number of frames currently held by this class.
   int NumFrames_Locked() const;
 
   // Updates |current_frame_| to the next frame on |ready_frames_| and calls
   // |size_changed_cb_| if the natural size changes.
   void SetCurrentFrameToNextReadyFrame();
 
+  // Pops the front of |decoders_|, assigns it to |decoder_| and then
+  // calls initialize on the new decoder.
+  void InitializeNextDecoder();
+
+  // Called when |decoder_| initialization completes.
+  void OnDecoderInitDone(PipelineStatus status);
+
   // Used for accessing data members.
   base::Lock lock_;
 
+  // List of candidate decoders to try during initialization.
+  VideoDecoderList decoders_;

[Ami GONE FROM CHROMIUM, 2012/08/09 20:30:18]

This is only used during initialization, so could also be bound into the
initializenextdecoder calls.

[acolwell GONE FROM CHROMIUM, 2012/08/09 22:23:32]

Done.

+
+  scoped_refptr<DemuxerStream> demuxer_stream_;

[Ami GONE FROM CHROMIUM, 2012/08/09 20:30:18]

ditto

[acolwell GONE FROM CHROMIUM, 2012/08/09 22:23:32]

Done.

   scoped_refptr<VideoDecoder> decoder_;
 
   // Queue of incoming frames as well as the current frame since the last time
   // OnFrameAvailable() was called.
   typedef std::deque<scoped_refptr<VideoFrame> > VideoFrameQueue;
   VideoFrameQueue ready_frames_;
 
   // The current frame available to subclasses for rendering via
   // GetCurrentFrame().  |current_frame_| can only be altered when
   // |pending_paint_| is false.
@@ skipping 68 matching lines @@
 
   bool drop_frames_;
 
   float playback_rate_;
 
   // Playback operation callbacks.
   base::Closure flush_cb_;
   PipelineStatusCB preroll_cb_;
 
   // Event callbacks.
+  PipelineStatusCB init_cb_;
   StatisticsCB statistics_cb_;
   TimeCB max_time_cb_;
   NaturalSizeChangedCB size_changed_cb_;
   base::Closure ended_cb_;
   PipelineStatusCB error_cb_;
   TimeDeltaCB get_time_cb_;
   TimeDeltaCB get_duration_cb_;
 
   base::TimeDelta preroll_timestamp_;
 
@@ skipping 10 matching lines @@
 
   // The last natural size |size_changed_cb_| was called with.
   gfx::Size last_natural_size_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoRendererBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_