Combining SetVideoSend and SetSource into one method.

webrtc/pc/channel.cc

 /*
  *  Copyright 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1789 matching lines @@
   Deinit();
 }
 
 bool VideoChannel::SetSink(uint32_t ssrc,
                            rtc::VideoSinkInterface<VideoFrame>* sink) {
   worker_thread()->Invoke<void>(
       Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink));
   return true;
 }
 
-void VideoChannel::SetSource(
+bool VideoChannel::SetVideoSend(
     uint32_t ssrc,
+    bool mute,
+    const VideoOptions* options,
     rtc::VideoSourceInterface<cricket::VideoFrame>* source) {
-  worker_thread()->Invoke<void>(
-      Bind(&VideoMediaChannel::SetSource, media_channel(), ssrc, source));
-}
-
-bool VideoChannel::SetVideoSend(uint32_t ssrc,
-                                bool mute,
-                                const VideoOptions* options) {
   return InvokeOnWorker(Bind(&VideoMediaChannel::SetVideoSend, media_channel(),
-                             ssrc, mute, options));
+                             ssrc, mute, options, source));
 }
 
 webrtc::RtpParameters VideoChannel::GetRtpParameters(uint32_t ssrc) const {
   return worker_thread()->Invoke<webrtc::RtpParameters>(
       Bind(&VideoChannel::GetRtpParameters_w, this, ssrc));
 }
 
 webrtc::RtpParameters VideoChannel::GetRtpParameters_w(uint32_t ssrc) const {
   return media_channel()->GetRtpParameters(ssrc);
 }
@@ skipping 491 matching lines @@
   return data_channel_type_ == DCT_RTP && BaseChannel::ShouldSetupDtlsSrtp_n();
 }
 
 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
   rtc::TypedMessageData<uint32_t>* message =
       new rtc::TypedMessageData<uint32_t>(sid);
   signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
 }
 
 }  // namespace cricket