corresponding change in CaptureVideoDecoder and RTCVideoDecoder due to pull model used in medi...

content/renderer/media/capture_video_decoder.h

Index: content/renderer/media/capture_video_decoder.h
===================================================================
--- content/renderer/media/capture_video_decoder.h	(revision 109978)
+++ content/renderer/media/capture_video_decoder.h	(working copy)
@@ -5,7 +5,7 @@
 #ifndef CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_
 #define CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_
 
-#include <deque>
+#include <queue>
 
 #include "base/time.h"
 #include "content/common/content_export.h"
@@ -37,6 +37,7 @@
   virtual void Seek(base::TimeDelta time,
                     const media::FilterStatusCB& cb) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
+  virtual void Flush(const base::Closure& callback) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
 
   // Decoder implementation.
@@ -74,6 +75,7 @@
   void SeekOnDecoderThread(base::TimeDelta time,
                            const media::FilterStatusCB& cb);
   void PauseOnDecoderThread(const base::Closure& callback);
+  void FlushOnDecoderThread(const base::Closure& callback);
   void StopOnDecoderThread(const base::Closure& callback);
 
   void InitializeOnDecoderThread(
@@ -90,15 +92,15 @@
       media::VideoCapture* capture,
       const media::VideoCaptureParams& device_info);
 
-  // Delivers the frame to |read_cb_| and resets the callback.
-  void DeliverFrame(const scoped_refptr<media::VideoFrame>& video_frame);
+  // Helper.

[scherkus (not reviewing), 2011/11/17 02:05:22]

this comment isn't useful -- please either write an informative comment or
remove the comment

[wjia(left Chromium), 2011/11/17 19:14:45]

Done.

+  void DeliverBlackFrame(const ReadCB& read_cb);
 
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
   scoped_refptr<VideoCaptureImplManager> vc_manager_;
   media::VideoCapture::VideoCaptureCapability capability_;
   gfx::Size natural_size_;
   DecoderState state_;
-  ReadCB read_cb_;
+  std::queue<ReadCB> read_cbs_;

[scherkus (not reviewing), 2011/11/17 02:05:22]

please remove queues

I'm not sure I understand your reason to complicate the implementation

   base::Closure pending_stop_cb_;
   media::StatisticsCallback statistics_callback_;