Introduce VideoFrameStream, the video frame provider in media pipeline.

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/memory/weak_ptr.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"
 #include "media/base/decryptor.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"
+#include "media/filters/video_frame_stream.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace media {
 
 class DecryptingDemuxerStream;
 class VideoDecoderSelector;
 
@@ skipping 45 matching lines @@
   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;
 
   // PlatformThread::Delegate implementation.
   virtual void ThreadMain() OVERRIDE;
 
  private:
-  // Called when |decoder_selector_| selected the |selected_decoder|.
-  // |decrypting_demuxer_stream| was also populated if a DecryptingDemuxerStream
-  // created to help decrypt the encrypted stream.
-  // Note: |decoder_selector| is passed here to keep the VideoDecoderSelector
-  // alive until OnDecoderSelected() finishes.
-  void OnDecoderSelected(
-      scoped_ptr<VideoDecoderSelector> decoder_selector,
-      const scoped_refptr<VideoDecoder>& selected_decoder,
-      const scoped_refptr<DecryptingDemuxerStream>& decrypting_demuxer_stream);
+  // Callback for |video_frame_stream_| initialization.
+  void OnVideoFrameStreamInitialized(bool success, bool has_alpha);
 
   // Callback from the video decoder delivering decoded video frames and
   // reporting video decoder status.
   void FrameReady(VideoDecoder::Status status,
                   const scoped_refptr<VideoFrame>& frame);
 
   // Helper method for adding a frame to |ready_frames_|.
   void AddReadyFrame_Locked(const scoped_refptr<VideoFrame>& frame);
 
   // Helper method that schedules an asynchronous read from the decoder as long
   // as there isn't a pending read and we have capacity.
   void AttemptRead();
   void AttemptRead_Locked();
 
-  // Called when VideoDecoder::Reset() completes.
-  void OnDecoderResetDone();
+  // Called when VideoFrameStream::Reset() completes.
+  void OnVideoFrameStreamResetDone();
 
   // Attempts to complete flushing and transition into the flushed state.
   void AttemptFlush_Locked();
 
   // Calculates the duration to sleep for based on |last_timestamp_|,
   // the next frame timestamp (may be NULL), and the provided playback rate.
   //
   // We don't use |playback_rate_| to avoid locking.
   base::TimeDelta CalculateSleepDuration(
       const scoped_refptr<VideoFrame>& next_frame,
       float playback_rate);
 
   // Helper function that flushes the buffers when a Stop() or error occurs.
   void DoStopOrError_Locked();
 
   // Runs |paint_cb_| with the next frame from |ready_frames_|, updating
   // |last_natural_size_| and running |size_changed_cb_| if the natural size
   // changes.
   //
   // A read is scheduled to replace the frame.
   void PaintNextReadyFrame_Locked();
 
   // Drops the next frame from |ready_frames_| and runs |statistics_cb_|.
   //
   // A read is scheduled to replace the frame.
   void DropNextReadyFrame_Locked();
 
-  void ResetDecoder();
-  void StopDecoder(const base::Closure& callback);
-
-  // Pops the front of |decoders|, assigns it to |decoder_| and then
-  // calls initialize on the new decoder.
-  void InitializeNextDecoder(const scoped_refptr<DemuxerStream>& demuxer_stream,
-                             scoped_ptr<VideoDecoderList> decoders);
-
-  // Called when |decoder_| initialization completes.
-  // |demuxer_stream| & |decoders| are used if initialization failed and
-  // InitializeNextDecoder() needs to be called again.
-  void OnDecoderInitDone(const scoped_refptr<DemuxerStream>& demuxer_stream,
-                         scoped_ptr<VideoDecoderList> decoders,
-                         PipelineStatus status);
-
   void TransitionToPrerolled_Locked();
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   base::WeakPtrFactory<VideoRendererBase> weak_factory_;
   base::WeakPtr<VideoRendererBase> weak_this_;
 
   // Used for accessing data members.
   base::Lock lock_;
 
-  SetDecryptorReadyCB set_decryptor_ready_cb_;
-
-  // These two will be set by VideoDecoderSelector::SelectVideoDecoder().
-  scoped_refptr<VideoDecoder> decoder_;
-  scoped_refptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
+  // Provides video frames to VideoRendererBase.
+  VideoFrameStream video_frame_stream_;
 
   // Queue of incoming frames yet to be painted.
   typedef std::deque<scoped_refptr<VideoFrame> > VideoFrameQueue;
   VideoFrameQueue ready_frames_;
 
   // Keeps track of whether we received the end of stream buffer.
   bool received_end_of_stream_;
 
   // Used to signal |thread_| as frames are added to |frames_|.  Rule of thumb:
   // always check |state_| to see if it was set to STOPPED after waking up!
@@ skipping 86 matching lines @@
   // either for calling |paint_cb_| or for dropping. Set to kNoTimestamp()
   // during flushing.
   base::TimeDelta last_timestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoRendererBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_