Combining SetVideoSend and SetSource into one method.

webrtc/media/base/mediachannel.h

Index: webrtc/media/base/mediachannel.h
diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h
index 95355c9576a1afd117a4a5e4af43065b1a2cd654..d5d1e0df86012539fb10d396fc3e6c20edf0a718 100644
--- a/webrtc/media/base/mediachannel.h
+++ b/webrtc/media/base/mediachannel.h
@@ -278,6 +278,7 @@ struct VideoOptions {
            screencast_min_bitrate_kbps == o.screencast_min_bitrate_kbps &&
            is_screencast == o.is_screencast;
   }
+  bool operator!=(const VideoOptions& o) const { return !(*this == o); }
 
   std::string ToString() const {
     std::ostringstream ost;
@@ -986,16 +987,15 @@ class VideoMediaChannel : public MediaChannel {
   // Starts or stops transmission (and potentially capture) of local video.
   virtual bool SetSend(bool send) = 0;
   // Configure stream for sending.
+  // |ssrc| must be non-zero.
   virtual bool SetVideoSend(uint32_t ssrc,
                             bool enable,
-                            const VideoOptions* options) = 0;
+                            const VideoOptions* options,
+                            VideoCapturer* capturer) = 0;
   // Sets the sink object to be used for the specified stream.
   // If SSRC is 0, the renderer is used for the 'default' stream.
   virtual bool SetSink(uint32_t ssrc,
                        rtc::VideoSinkInterface<cricket::VideoFrame>* sink) = 0;
-  // If |ssrc| is 0, replace the default capturer (engine capturer) with
-  // |capturer|. If |ssrc| is non zero create a new stream with |ssrc| as SSRC.
-  virtual bool SetCapturer(uint32_t ssrc, VideoCapturer* capturer) = 0;
   // Gets quality stats for the channel.
   virtual bool GetStats(VideoMediaInfo* info) = 0;
 };