Make cricket::VideoCapturer implement VideoSourceInterface

talk/media/webrtc/webrtcvideoengine2.h

Index: talk/media/webrtc/webrtcvideoengine2.h
diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h
index eff1a612c82a74708e0e17a2ee86655bbf212e50..94f52bad69dd3cbbf87ca38c332d87caf93166da 100644
--- a/talk/media/webrtc/webrtcvideoengine2.h
+++ b/talk/media/webrtc/webrtcvideoengine2.h
@@ -166,6 +166,7 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
   bool SetVideoSend(uint32_t ssrc,
                     bool mute,
                     const VideoOptions* options) override;
+  rtc::VideoSinkInterface<cricket::VideoFrame>* GetSink(uint32_t ssrc) override;
   bool AddSendStream(const StreamParams& sp) override;
   bool RemoveSendStream(uint32_t ssrc) override;
   bool AddRecvStream(const StreamParams& sp) override;
@@ -247,7 +248,8 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
 
   // Wrapper for the sender part, this is where the capturer is connected and
   // frames are then converted from cricket frames to webrtc frames.
-  class WebRtcVideoSendStream : public sigslot::has_slots<> {
+  class WebRtcVideoSendStream :
+      public rtc::VideoSinkInterface<cricket::VideoFrame> {
    public:
     WebRtcVideoSendStream(
         webrtc::Call* call,
@@ -259,13 +261,13 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
         const rtc::Optional<VideoCodecSettings>& codec_settings,
         const std::vector<webrtc::RtpExtension>& rtp_extensions,
         const VideoSendParameters& send_params);
-    ~WebRtcVideoSendStream();
+    virtual ~WebRtcVideoSendStream();
 
     void SetOptions(const VideoOptions& options);
     // TODO(pbos): Move logic from SetOptions into this method.
     void SetSendParameters(const ChangedSendParameters& send_params);
 
-    void InputFrame(VideoCapturer* capturer, const VideoFrame* frame);
+    void OnFrame(const cricket::VideoFrame& frame) override;
     bool SetCapturer(VideoCapturer* capturer);
     bool SetVideoFormat(const VideoFormat& format);
     void MuteStream(bool mute);
@@ -374,6 +376,10 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
     Dimensions last_dimensions_ GUARDED_BY(lock_);
 
     VideoCapturer* capturer_ GUARDED_BY(lock_);
+    // TODO(nisse): Keeping this flag here, caching
+    // capturer_->IsScreencast(), is a temporary hack. The plan is to
+    // move the screencast flag into VideoOptions.
+    bool is_screencast_;
     bool sending_ GUARDED_BY(lock_);
     bool muted_ GUARDED_BY(lock_);
     VideoFormat format_ GUARDED_BY(lock_);