Make WebRtcVideoChannel2::WebRtcVideoSendStream implement rtc::VideoRendererInterface.

talk/media/webrtc/webrtcvideoengine2.h

 /*
  * libjingle
  * Copyright 2014 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 149 matching lines @@
 
   // VideoMediaChannel implementation
   bool SetSendParameters(const VideoSendParameters& params) override;
   bool SetRecvParameters(const VideoRecvParameters& params) override;
   bool GetSendCodec(VideoCodec* send_codec) override;
   bool SetSendStreamFormat(uint32_t ssrc, const VideoFormat& format) override;
   bool SetSend(bool send) override;
   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;
   bool AddRecvStream(const StreamParams& sp, bool default_stream);
   bool RemoveRecvStream(uint32_t ssrc) override;
   bool SetRenderer(uint32_t ssrc, VideoRenderer* renderer) override;
   bool GetStats(VideoMediaInfo* info) override;
   bool SetCapturer(uint32_t ssrc, VideoCapturer* capturer) override;
   bool SendIntraFrame() override;
   bool RequestIntraFrame() override;
@@ skipping 46 matching lines @@
     VideoCodec codec;
     webrtc::FecConfig fec;
     int rtx_payload_type;
   };
 
   static std::string CodecSettingsVectorToString(
       const std::vector<VideoCodecSettings>& codecs);
 
   // 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,
         const StreamParams& sp,
         const webrtc::VideoSendStream::Config& config,
         WebRtcVideoEncoderFactory* external_encoder_factory,
         const VideoOptions& options,
         int max_bitrate_bps,
         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);
     void SetCodec(const VideoCodecSettings& codec);
     void SetRtpExtensions(
         const std::vector<webrtc::RtpExtension>& rtp_extensions);
     // TODO(deadbeef): Move logic from SetCodec/SetRtpExtensions/etc.
     // into this method. Currently this method only sets the RTCP mode.
     void SetSendParameters(const VideoSendParameters& 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);
     bool DisconnectCapturer();
 
     void SetApplyRotation(bool apply_rotation);
 
     void Start();
     void Stop();
 
@@ skipping 90 matching lines @@
         GUARDED_BY(lock_);
 
     rtc::CriticalSection lock_;
     webrtc::VideoSendStream* stream_ GUARDED_BY(lock_);
     VideoSendStreamParameters parameters_ GUARDED_BY(lock_);
     VideoEncoderSettings encoder_settings_ GUARDED_BY(lock_);
     AllocatedEncoder allocated_encoder_ GUARDED_BY(lock_);
     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_);
     int old_adapt_changes_ GUARDED_BY(lock_);
 
     // The timestamp of the first frame received
     // Used to generate the timestamps of subsequent frames
     int64_t first_frame_timestamp_ms_ GUARDED_BY(lock_);
 
     // The timestamp of the last frame received
@@ skipping 147 matching lines @@
   VideoOptions options_;
   // TODO(deadbeef): Don't duplicate information between
   // send_params/recv_params, rtp_extensions, options, etc.
   VideoSendParameters send_params_;
   VideoRecvParameters recv_params_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_