Make cricket::VideoCapturer implement VideoSourceInterface

talk/app/webrtc/rtpsender.cc

 /*
  * libjingle
  * Copyright 2015 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 255 matching lines @@
   if (track && track->kind() != MediaStreamTrackInterface::kVideoKind) {
     LOG(LS_ERROR) << "SetTrack called on video RtpSender with " << track->kind()
                   << " track.";
     return false;
   }
   VideoTrackInterface* video_track = static_cast<VideoTrackInterface*>(track);
 
   // Detach from old track.
   if (track_) {
     track_->UnregisterObserver(this);
+    track_->RemoveSink(sink_);
+    sink_ = nullptr;
   }
 
   // Attach to new track.
   bool prev_can_send_track = can_send_track();
   track_ = video_track;
   if (track_) {
     cached_track_enabled_ = track_->enabled();
     track_->RegisterObserver(this);
   }
 
   // Update video provider.
   if (can_send_track()) {
     VideoSourceInterface* source = track_->GetSource();
+    sink_ = provider_->GetSink(ssrc_);
+    RTC_CHECK(sink_);
     // 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 SetCaptureDevice and
     // SetVideoSend
     // to be combined into one atomic operation, all the way down to
     // WebRtcVideoSendStream.
     provider_->SetCaptureDevice(ssrc_,
                                 source ? source->GetVideoCapturer() : nullptr);
     SetVideoSend();
+    track_->AddSink(sink_);
   } else if (prev_can_send_track) {
     provider_->SetCaptureDevice(ssrc_, nullptr);
     provider_->SetVideoSend(ssrc_, false, nullptr);
   }
   return true;
 }
 
 void VideoRtpSender::SetSsrc(uint32_t ssrc) {
   if (stopped_ || ssrc == ssrc_) {
     return;
   }
   // If we are already sending with a particular SSRC, stop sending.
   if (can_send_track()) {
     provider_->SetCaptureDevice(ssrc_, nullptr);
     provider_->SetVideoSend(ssrc_, false, nullptr);
+    track_->RemoveSink(sink_);
+    sink_ = nullptr;
   }
   ssrc_ = ssrc;
   if (can_send_track()) {
     VideoSourceInterface* source = track_->GetSource();
     provider_->SetCaptureDevice(ssrc_,
                                 source ? source->GetVideoCapturer() : nullptr);
     SetVideoSend();
+    sink_ = provider_->GetSink(ssrc_);
+    track_->AddSink(sink_);
   }
 }
 
 void VideoRtpSender::Stop() {
   // TODO(deadbeef): Need to do more here to fully stop sending packets.
   if (stopped_) {
     return;
   }
   if (track_) {
     track_->UnregisterObserver(this);
+    RTC_DCHECK(sink_);
+    RTC_DCHECK(sink_ == provider_->GetSink(ssrc_));
+    track_->RemoveSink(sink_);
   }
   if (can_send_track()) {
     provider_->SetCaptureDevice(ssrc_, nullptr);
     provider_->SetVideoSend(ssrc_, false, nullptr);
   }
   stopped_ = true;
 }
 
 void VideoRtpSender::SetVideoSend() {
   RTC_DCHECK(!stopped_ && can_send_track());
   const cricket::VideoOptions* options = nullptr;
   VideoSourceInterface* source = track_->GetSource();
   if (track_->enabled() && source) {
     options = source->options();
   }
   provider_->SetVideoSend(ssrc_, track_->enabled(), options);
 }
 
 }  // namespace webrtc