Removed VideoSource dependency to ChannelManager.

webrtc/api/peerconnection.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 364 matching lines @@
 }
 
 }  // namespace
 
 namespace webrtc {
 
 // Factory class for creating remote MediaStreams and MediaStreamTracks.
 class RemoteMediaStreamFactory {
  public:
   explicit RemoteMediaStreamFactory(rtc::Thread* signaling_thread,
-                                    cricket::ChannelManager* channel_manager)
+                                    rtc::Thread* worker_thread)
       : signaling_thread_(signaling_thread),
-        channel_manager_(channel_manager) {}
+        worker_thread_(worker_thread) {}
 
   rtc::scoped_refptr<MediaStreamInterface> CreateMediaStream(
       const std::string& stream_label) {
     return MediaStreamProxy::Create(signaling_thread_,
                                     MediaStream::Create(stream_label));
   }
 
   AudioTrackInterface* AddAudioTrack(uint32_t ssrc,
                                      AudioProviderInterface* provider,
                                      webrtc::MediaStreamInterface* stream,
                                      const std::string& track_id) {
     return AddTrack<AudioTrackInterface, AudioTrack, AudioTrackProxy>(
         stream, track_id, RemoteAudioSource::Create(ssrc, provider));
   }
 
   VideoTrackInterface* AddVideoTrack(webrtc::MediaStreamInterface* stream,
                                      const std::string& track_id) {
     return AddTrack<VideoTrackInterface, VideoTrack, VideoTrackProxy>(
         stream, track_id,
-        VideoSource::Create(channel_manager_, new RemoteVideoCapturer(),
+        VideoSource::Create(worker_thread_, new RemoteVideoCapturer(),
                             nullptr, true)
             .get());
   }
 
  private:
   template <typename TI, typename T, typename TP, typename S>
   TI* AddTrack(MediaStreamInterface* stream,
                const std::string& track_id,
                const S& source) {
     rtc::scoped_refptr<TI> track(
         TP::Create(signaling_thread_, T::Create(track_id, source)));
     track->set_state(webrtc::MediaStreamTrackInterface::kLive);
     if (stream->AddTrack(track)) {
       return track;
     }
     return nullptr;
   }
 
   rtc::Thread* signaling_thread_;
-  cricket::ChannelManager* channel_manager_;
+  rtc::Thread* worker_thread_;
 };
 
 bool ConvertRtcOptionsForOffer(
     const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options,
     cricket::MediaSessionOptions* session_options) {
   typedef PeerConnectionInterface::RTCOfferAnswerOptions RTCOfferAnswerOptions;
   if (!IsValidOfferToReceiveMedia(rtc_options.offer_to_receive_audio) ||
       !IsValidOfferToReceiveMedia(rtc_options.offer_to_receive_video)) {
     return false;
   }
@@ skipping 188 matching lines @@
                  &media_config.video.enable_cpu_overuse_detection, NULL);
 
   // Find Suspend Below Min Bitrate constraint.
   FindConstraint(constraints,
                  MediaConstraintsInterface::kEnableVideoSuspendBelowMinBitrate,
                  &media_config.video.suspend_below_min_bitrate, NULL);
 
   media_controller_.reset(factory_->CreateMediaController(media_config));
 
   remote_stream_factory_.reset(new RemoteMediaStreamFactory(
-      factory_->signaling_thread(), media_controller_->channel_manager()));
+      factory_->signaling_thread(), factory_->worker_thread()));
 
   session_.reset(
       new WebRtcSession(media_controller_.get(), factory_->signaling_thread(),
                         factory_->worker_thread(), port_allocator_.get()));
   stats_.reset(new StatsCollector(this));
 
   // Initialize the WebRtcSession. It creates transport channels etc.
   if (!session_->Initialize(factory_->options(), constraints,
                             std::move(dtls_identity_store), configuration)) {
     return false;
@@ skipping 1451 matching lines @@
 DataChannel* PeerConnection::FindDataChannelBySid(int sid) const {
   for (const auto& channel : sctp_data_channels_) {
     if (channel->id() == sid) {
       return channel;
     }
   }
   return nullptr;
 }
 
 }  // namespace webrtc