Combining SetVideoSend and SetSource into one method.

webrtc/api/rtpsender.cc

 /*
  *  Copyright 2015 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 262 matching lines @@
   VideoTrackInterface* video_track = static_cast<VideoTrackInterface*>(track);
 
   // Detach from old track.
   if (track_) {
     track_->UnregisterObserver(this);
   }
 
   // Attach to new track.
   bool prev_can_send_track = can_send_track();
   // Keep a reference to the old track to keep it alive until we call
-  // SetSource.
+  // SetVideoSend.
   rtc::scoped_refptr<VideoTrackInterface> old_track = track_;
   track_ = video_track;
   if (track_) {
     cached_track_enabled_ = track_->enabled();
     track_->RegisterObserver(this);
   }
 
   // Update video provider.
   if (can_send_track()) {
-    // TODO(deadbeef): If SetTrack is called with a disabled track, and the
-    // previous track was enabled, this could cause a frame from the new track
-    // to slip out. Really, what we need is for SetSource and SetVideoSend
-    // to be combined into one atomic operation, all the way down to
-    // WebRtcVideoSendStream.
-
-    provider_->SetSource(ssrc_, track_);
     SetVideoSend();
   } else if (prev_can_send_track) {
-    provider_->SetSource(ssrc_, nullptr);
-    provider_->SetVideoSend(ssrc_, false, nullptr);
+    provider_->SetVideoSend(ssrc_, false, nullptr, nullptr);
   }
   return true;
 }
 
 void VideoRtpSender::SetSsrc(uint32_t ssrc) {
   TRACE_EVENT0("webrtc", "VideoRtpSender::SetSsrc");
   if (stopped_ || ssrc == ssrc_) {
     return;
   }
   // If we are already sending with a particular SSRC, stop sending.
   if (can_send_track()) {
-    provider_->SetSource(ssrc_, nullptr);
-    provider_->SetVideoSend(ssrc_, false, nullptr);
+    provider_->SetVideoSend(ssrc_, false, nullptr, nullptr);
   }
   ssrc_ = ssrc;
   if (can_send_track()) {
-    provider_->SetSource(ssrc_, track_);
     SetVideoSend();
   }
 }
 
 void VideoRtpSender::Stop() {
   TRACE_EVENT0("webrtc", "VideoRtpSender::Stop");
   // TODO(deadbeef): Need to do more here to fully stop sending packets.
   if (stopped_) {
     return;
   }
   if (track_) {
     track_->UnregisterObserver(this);
   }
   if (can_send_track()) {
-    provider_->SetSource(ssrc_, nullptr);
-    provider_->SetVideoSend(ssrc_, false, nullptr);
+    provider_->SetVideoSend(ssrc_, false, nullptr, nullptr);
   }
   stopped_ = true;
 }
 
 void VideoRtpSender::SetVideoSend() {
   RTC_DCHECK(!stopped_ && can_send_track());
   cricket::VideoOptions options;
   VideoTrackSourceInterface* source = track_->GetSource();
   if (source) {
     options.is_screencast = rtc::Optional<bool>(source->is_screencast());
     options.video_noise_reduction = source->needs_denoising();
   }
-  provider_->SetVideoSend(ssrc_, track_->enabled(), &options);
+  provider_->SetVideoSend(ssrc_, track_->enabled(), &options, track_);
 }
 
 RtpParameters VideoRtpSender::GetParameters() const {
   return provider_->GetVideoRtpParameters(ssrc_);
 }
 
 bool VideoRtpSender::SetParameters(const RtpParameters& parameters) {
   TRACE_EVENT0("webrtc", "VideoRtpSender::SetParameters");
   return provider_->SetVideoRtpParameters(ssrc_, parameters);
 }
 
 }  // namespace webrtc