Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1138)

Unified Diff: webrtc/pc/channel.cc

Issue 2675173003: Adding "adapter" ORTC objects on top of ChannelManager/BaseChannel/etc. (Closed)
Patch Set: Add memcheck suppression for end-to-end tests. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/pc/BUILD.gn ('k') | webrtc/pc/channelmanager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/channel.cc
diff --git a/webrtc/pc/channel.cc b/webrtc/pc/channel.cc
index 02d93f79e760968226aac953a4fa01565fbeb7b3..9ac9d201ab57eecf632fdfc514bb956058b0e994 100644
--- a/webrtc/pc/channel.cc
+++ b/webrtc/pc/channel.cc
@@ -1258,10 +1258,14 @@ bool BaseChannel::SetRtcpMux_n(bool enable,
case CA_ANSWER:
ret = rtcp_mux_filter_.SetAnswer(enable, src);
if (ret && rtcp_mux_filter_.IsActive()) {
- // We activated RTCP mux, close down the RTCP transport.
+ // We permanently activated RTCP muxing; signal that we no longer need
+ // the RTCP transport.
+ std::string debug_name = transport_name_.empty()
+ ? rtp_packet_transport_->debug_name()
+ : transport_name_;
+ ;
LOG(LS_INFO) << "Enabling rtcp-mux for " << content_name()
- << " by destroying RTCP transport for "
- << transport_name();
+ << "; no longer need RTCP transport for " << debug_name;
if (rtcp_packet_transport_) {
SetTransport_n(true, nullptr, nullptr);
SignalRtcpMuxFullyActive(transport_name_);
« no previous file with comments | « webrtc/pc/BUILD.gn ('k') | webrtc/pc/channelmanager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698