Remove BaseChannel's dependency on TransportController.

webrtc/pc/channelmanager.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 219 matching lines @@
     webrtc::MediaControllerInterface* media_controller,
     TransportController* transport_controller,
     const std::string& content_name,
     const std::string* bundle_transport_name,
     bool rtcp,
     bool srtp_required,
     const AudioOptions& options) {
   ASSERT(initialized_);
   ASSERT(worker_thread_ == rtc::Thread::Current());
   ASSERT(nullptr != media_controller);
+
   VoiceMediaChannel* media_channel = media_engine_->CreateChannel(
       media_controller->call_w(), media_controller->config(), options);
   if (!media_channel)
     return nullptr;
 
+  rtc::Thread* signaling_thread =
+      transport_controller ? transport_controller->signaling_thread() : nullptr;
   VoiceChannel* voice_channel = new VoiceChannel(
-      worker_thread_, network_thread_, media_engine_.get(), media_channel,
-      transport_controller, content_name, rtcp, srtp_required);
+      worker_thread_, network_thread_, signaling_thread, media_engine_.get(),
+      media_channel, content_name, rtcp, srtp_required);
   voice_channel->SetCryptoOptions(crypto_options_);
-  if (!voice_channel->Init_w(bundle_transport_name)) {
+  std::string transport_name =
+      bundle_transport_name ? *bundle_transport_name : content_name;
+  TransportChannel* rtp_transport =
+      transport_controller->CreateTransportChannel(
+          transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
+  TransportChannel* rtcp_transport =
+      rtcp
+          ? transport_controller->CreateTransportChannel(
+                transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP)
+          : nullptr;

[Taylor Brandstetter, 2017/01/09 22:50:42]

Could this code be moved to WebRtcSession? That would make WebRtcSession
responsible for all calls to "CreateTransportChannel", and would allow the
"transport_controller" argument to be removed from these
"Create[Voice/Video/Data]Channel" methods.

[Zhi Huang, 2017/01/12 03:47:46]

Done.

+  if (!voice_channel->Init_w(rtp_transport, rtcp_transport)) {
     delete voice_channel;
     return nullptr;
   }
   voice_channels_.push_back(voice_channel);
   return voice_channel;
 }
 
 void ChannelManager::DestroyVoiceChannel(VoiceChannel* voice_channel) {
   TRACE_EVENT0("webrtc", "ChannelManager::DestroyVoiceChannel");
   if (voice_channel) {
@@ skipping 41 matching lines @@
     const VideoOptions& options) {
   ASSERT(initialized_);
   ASSERT(worker_thread_ == rtc::Thread::Current());
   ASSERT(nullptr != media_controller);
   VideoMediaChannel* media_channel = media_engine_->CreateVideoChannel(
       media_controller->call_w(), media_controller->config(), options);
   if (media_channel == NULL) {
     return NULL;
   }
 
+  rtc::Thread* signaling_thread =
+      transport_controller ? transport_controller->signaling_thread() : nullptr;
   VideoChannel* video_channel =
-      new VideoChannel(worker_thread_, network_thread_, media_channel,
-                       transport_controller, content_name, rtcp, srtp_required);
+      new VideoChannel(worker_thread_, network_thread_, signaling_thread,
+                       media_channel, content_name, rtcp, srtp_required);
   video_channel->SetCryptoOptions(crypto_options_);
-  if (!video_channel->Init_w(bundle_transport_name)) {
+  std::string transport_name =
+      bundle_transport_name ? *bundle_transport_name : content_name;
+  TransportChannel* rtp_transport =
+      transport_controller->CreateTransportChannel(
+          transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
+  TransportChannel* rtcp_transport =
+      rtcp
+          ? transport_controller->CreateTransportChannel(
+                transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP)
+          : nullptr;
+  if (!video_channel->Init_w(rtp_transport, rtcp_transport)) {
     delete video_channel;
     return NULL;
   }
   video_channels_.push_back(video_channel);
   return video_channel;
 }
 
 void ChannelManager::DestroyVideoChannel(VideoChannel* video_channel) {
   TRACE_EVENT0("webrtc", "ChannelManager::DestroyVideoChannel");
   if (video_channel) {
@@ skipping 47 matching lines @@
   if (media_controller) {
     config = media_controller->config();
   }
   DataMediaChannel* media_channel =
       data_media_engine_->CreateChannel(data_channel_type, config);
   if (!media_channel) {
     LOG(LS_WARNING) << "Failed to create data channel of type "
                     << data_channel_type;
     return NULL;
   }
-
+  rtc::Thread* signaling_thread =
+      transport_controller ? transport_controller->signaling_thread() : nullptr;
   // Only RTP data channels need SRTP.
   srtp_required = srtp_required && data_channel_type == DCT_RTP;
   DataChannel* data_channel =
-      new DataChannel(worker_thread_, network_thread_, media_channel,
-                      transport_controller, content_name, rtcp, srtp_required);
+      new DataChannel(worker_thread_, network_thread_, signaling_thread,
+                      media_channel, content_name, rtcp, srtp_required);
+  std::string transport_name =
+      bundle_transport_name ? *bundle_transport_name : content_name;
+  TransportChannel* rtp_transport =
+      transport_controller->CreateTransportChannel(
+          transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
+  TransportChannel* rtcp_transport =
+      rtcp
+          ? transport_controller->CreateTransportChannel(
+                transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP)
+          : nullptr;
   data_channel->SetCryptoOptions(crypto_options_);
-  if (!data_channel->Init_w(bundle_transport_name)) {
+  if (!data_channel->Init_w(rtp_transport, rtcp_transport)) {
     LOG(LS_WARNING) << "Failed to init data channel.";
     delete data_channel;
     return NULL;
   }
   data_channels_.push_back(data_channel);
   return data_channel;
 }
 
 void ChannelManager::DestroyDataChannel(DataChannel* data_channel) {
   TRACE_EVENT0("webrtc", "ChannelManager::DestroyDataChannel");
@@ skipping 25 matching lines @@
                           media_engine_.get(), file, max_size_bytes));
 }
 
 void ChannelManager::StopAecDump() {
   worker_thread_->Invoke<void>(
       RTC_FROM_HERE,
       Bind(&MediaEngineInterface::StopAecDump, media_engine_.get()));
 }
 
 }  // namespace cricket