Combining "SetTransportChannel" and "SetRtcpTransportChannel".

webrtc/pc/channel.h

 /*
  *  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 30 matching lines @@
 
 namespace webrtc {
 class AudioSinkInterface;
 }  // namespace webrtc
 
 namespace cricket {
 
 struct CryptoParams;
 class MediaContentDescription;
 
-// BaseChannel contains logic common to voice and video, including
-// enable, marshaling calls to a worker and network threads, and
-// connection and media monitors.
+// BaseChannel contains logic common to voice and video, including enable,
+// marshaling calls to a worker and network threads, and connection and media
+// monitors.
+//
 // BaseChannel assumes signaling and other threads are allowed to make
 // synchronous calls to the worker thread, the worker thread makes synchronous
 // calls only to the network thread, and the network thread can't be blocked by
 // other threads.
 // All methods with _n suffix must be called on network thread,
-//     methods with _w suffix - on worker thread
+//     methods with _w suffix on worker thread
 // and methods with _s suffix on signaling thread.
 // Network and worker threads may be the same thread.
 //
 // WARNING! SUBCLASSES MUST CALL Deinit() IN THEIR DESTRUCTORS!
 // This is required to avoid a data race between the destructor modifying the
 // vtable, and the media channel's thread using BaseChannel as the
 // NetworkInterface.
 
 class BaseChannel
     : public rtc::MessageHandler, public sigslot::has_slots<>,
@@ skipping 110 matching lines @@
   virtual cricket::MediaType media_type() = 0;
 
   bool SetCryptoOptions(const rtc::CryptoOptions& crypto_options);
 
  protected:
   virtual MediaChannel* media_channel() const { return media_channel_; }
 
   // Sets the |transport_channel_| (and |rtcp_transport_channel_|, if
   // |rtcp_enabled_| is true). Gets the transport channels from
   // |transport_controller_|.
+  // This method also updates writability and "ready-to-send" state.
   bool SetTransport_n(const std::string& transport_name);
 
-  void SetTransportChannel_n(TransportChannel* transport);
-  void SetRtcpTransportChannel_n(TransportChannel* transport,
-                                 bool update_writablity);
+  // This does not update writability or "ready-to-send" state; it just
+  // disconnects from the old channel and connects to the new one.
+  void SetTransportChannel_n(bool rtcp, TransportChannel* new_channel);
 
   bool was_ever_writable() const { return was_ever_writable_; }
   void set_local_content_direction(MediaContentDirection direction) {
     local_content_direction_ = direction;
   }
   void set_remote_content_direction(MediaContentDirection direction) {
     remote_content_direction_ = direction;
   }
   void set_secure_required(bool secure_required) {
     secure_required_ = secure_required;
@@ skipping 514 matching lines @@
   // SetSendParameters.
   DataSendParameters last_send_params_;
   // Last DataRecvParameters sent down to the media_channel() via
   // SetRecvParameters.
   DataRecvParameters last_recv_params_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_PC_CHANNEL_H_