Cast: deliver video frames on the IO thread

content/public/renderer/media_stream_video_sink.h

Index: content/public/renderer/media_stream_video_sink.h
diff --git a/content/public/renderer/media_stream_video_sink.h b/content/public/renderer/media_stream_video_sink.h
index 48a37199b5542be144b1c26de0a1c103180548c7..2e1711e80e3275bcd012ec853caa933568e7d73a 100644
--- a/content/public/renderer/media_stream_video_sink.h
+++ b/content/public/renderer/media_stream_video_sink.h
@@ -5,10 +5,12 @@
 #ifndef CONTENT_PUBLIC_RENDERER_MEDIA_STREAM_VIDEO_SINK_H_
 #define CONTENT_PUBLIC_RENDERER_MEDIA_STREAM_VIDEO_SINK_H_
 
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
 #include "content/public/renderer/media_stream_sink.h"
+#include "media/video/capture/video_capture_types.h"

[perkj_chrome, 2014/05/08 08:15:08]

 Can you forward declare const media::VideoCaptureFormat& the same way as
VideoFrame instead.

[Alpha Left Google, 2014/05/08 18:45:51]

Done.

 
 namespace media {
 class VideoFrame;
@@ -20,6 +22,11 @@ class WebMediaStreamTrack;
 
 namespace content {
 
+typedef base::Callback<
+  void(const scoped_refptr<media::VideoFrame>&,
+       const media::VideoCaptureFormat&)>
+    VideoSinkDeliverFrameCB;
+
 // MediaStreamVideoSink is an interface used for receiving video frames from a
 // Video Stream Track or a Video Source.
 // http://dev.w3.org/2011/webrtc/editor/getusermedia.html
@@ -30,13 +37,15 @@ class CONTENT_EXPORT MediaStreamVideoSink : public MediaStreamSink {
   // it is ready to receive data from a video track. Before the implementation
   // is destroyed, RemoveFromVideoTrack must be called.
   // Calls to these methods must be done on the main render thread.
+  // Note that |callback| for frame delivery can be called on an arbitrary

[perkj_chrome, 2014/05/08 08:15:08]

I like not making promises, but I think Tommmi wanted us to guarantee this is on
specific thread, namely the IO-thread currently. 

[Alpha Left Google, 2014/05/08 18:45:51]

Done.

+  // thread. Calling RemoveFromVideoTrack also does not stop frame delivery
+  // through the callback immediately because it may happen on another thread.
   static void AddToVideoTrack(MediaStreamVideoSink* sink,
+                              const VideoSinkDeliverFrameCB& callback,
                               const blink::WebMediaStreamTrack& track);
   static void RemoveFromVideoTrack(MediaStreamVideoSink* sink,
                                    const blink::WebMediaStreamTrack& track);
 
-  virtual void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame) = 0;
-
  protected:
   virtual ~MediaStreamVideoSink() {}
 };