Combining SetVideoSend and SetSource into one method.

webrtc/api/webrtcsession.cc

 /*
  *  Copyright 2012 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 1243 matching lines @@
 
 bool WebRtcSession::SetAudioRtpParameters(uint32_t ssrc,
                                           const RtpParameters& parameters) {
   ASSERT(signaling_thread()->IsCurrent());
   if (!voice_channel_) {
     return false;
   }
   return voice_channel_->SetRtpParameters(ssrc, parameters);
 }
 
-bool WebRtcSession::SetCaptureDevice(uint32_t ssrc,
-                                     cricket::VideoCapturer* camera) {
-  ASSERT(signaling_thread()->IsCurrent());
-
-  if (!video_channel_) {
-    // |video_channel_| doesnt't exist. Probably because the remote end doesnt't
-    // support video.
-    LOG(LS_WARNING) << "Video not used in this call.";
-    return false;
-  }
-  if (!video_channel_->SetCapturer(ssrc, camera)) {
-    // Allow that SetCapturer fail if |camera| is NULL but assert otherwise.
-    // This in the normal case when the underlying media channel has already
-    // been deleted.
-    ASSERT(camera == NULL);
-    return false;
-  }
-  return true;
-}
-
 void WebRtcSession::SetVideoPlayout(
     uint32_t ssrc,
     bool enable,
     rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
   ASSERT(signaling_thread()->IsCurrent());
   if (!video_channel_) {
     LOG(LS_WARNING) << "SetVideoPlayout: No video channel exists.";
     return;
   }
   if (!video_channel_->SetSink(ssrc, enable ? sink : NULL)) {
     // Allow that SetSink fail if |sink| is NULL but assert otherwise.
     // This in the normal case when the underlying media channel has already
     // been deleted.
     ASSERT(sink == NULL);
   }
 }
 
 void WebRtcSession::SetVideoSend(uint32_t ssrc,
                                  bool enable,
-                                 const cricket::VideoOptions* options) {
+                                 const cricket::VideoOptions* options,
+                                 cricket::VideoCapturer* camera) {
   ASSERT(signaling_thread()->IsCurrent());
   if (!video_channel_) {
     LOG(LS_WARNING) << "SetVideoSend: No video channel exists.";
     return;
   }
-  if (!video_channel_->SetVideoSend(ssrc, enable, options)) {
-    // Allow that MuteStream fail if |enable| is false but assert otherwise.
-    // This in the normal case when the underlying media channel has already
-    // been deleted.
-    ASSERT(enable == false);
+  if (!video_channel_->SetVideoSend(ssrc, enable, options, camera)) {
+    // Allow that MuteStream fail if |enable| is false and |camera| is NULL but
+    // assert otherwise. This in the normal case when the underlying media
+    // channel has already been deleted.
+    ASSERT(enable == false && camera == nullptr);
   }
 }
 
 RtpParameters WebRtcSession::GetVideoRtpParameters(uint32_t ssrc) const {
   ASSERT(signaling_thread()->IsCurrent());
   if (video_channel_) {
     return video_channel_->GetRtpParameters(ssrc);
   }
   return RtpParameters();
 }
@@ skipping 836 matching lines @@
   }
 }
 
 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel,
                                    const rtc::SentPacket& sent_packet) {
   RTC_DCHECK(worker_thread()->IsCurrent());
   media_controller_->call_w()->OnSentPacket(sent_packet);
 }
 
 }  // namespace webrtc