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

Side by Side 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, 9 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 unified diff | Download patch
« no previous file with comments | « webrtc/pc/BUILD.gn ('k') | webrtc/pc/channelmanager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 1240 matching lines...) Expand 10 before | Expand all | Expand 10 after
1251 ret = rtcp_mux_filter_.SetOffer(enable, src); 1251 ret = rtcp_mux_filter_.SetOffer(enable, src);
1252 break; 1252 break;
1253 case CA_PRANSWER: 1253 case CA_PRANSWER:
1254 // This may activate RTCP muxing, but we don't yet destroy the transport 1254 // This may activate RTCP muxing, but we don't yet destroy the transport
1255 // because the final answer may deactivate it. 1255 // because the final answer may deactivate it.
1256 ret = rtcp_mux_filter_.SetProvisionalAnswer(enable, src); 1256 ret = rtcp_mux_filter_.SetProvisionalAnswer(enable, src);
1257 break; 1257 break;
1258 case CA_ANSWER: 1258 case CA_ANSWER:
1259 ret = rtcp_mux_filter_.SetAnswer(enable, src); 1259 ret = rtcp_mux_filter_.SetAnswer(enable, src);
1260 if (ret && rtcp_mux_filter_.IsActive()) { 1260 if (ret && rtcp_mux_filter_.IsActive()) {
1261 // We activated RTCP mux, close down the RTCP transport. 1261 // We permanently activated RTCP muxing; signal that we no longer need
1262 // the RTCP transport.
1263 std::string debug_name = transport_name_.empty()
1264 ? rtp_packet_transport_->debug_name()
1265 : transport_name_;
1266 ;
1262 LOG(LS_INFO) << "Enabling rtcp-mux for " << content_name() 1267 LOG(LS_INFO) << "Enabling rtcp-mux for " << content_name()
1263 << " by destroying RTCP transport for " 1268 << "; no longer need RTCP transport for " << debug_name;
1264 << transport_name();
1265 if (rtcp_packet_transport_) { 1269 if (rtcp_packet_transport_) {
1266 SetTransport_n(true, nullptr, nullptr); 1270 SetTransport_n(true, nullptr, nullptr);
1267 SignalRtcpMuxFullyActive(transport_name_); 1271 SignalRtcpMuxFullyActive(transport_name_);
1268 } 1272 }
1269 UpdateWritableState_n(); 1273 UpdateWritableState_n();
1270 SetTransportChannelReadyToSend(true, false); 1274 SetTransportChannelReadyToSend(true, false);
1271 } 1275 }
1272 break; 1276 break;
1273 case CA_UPDATE: 1277 case CA_UPDATE:
1274 // No RTCP mux info. 1278 // No RTCP mux info.
(...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after
2453 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_READYTOSENDDATA, 2457 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_READYTOSENDDATA,
2454 new DataChannelReadyToSendMessageData(writable)); 2458 new DataChannelReadyToSendMessageData(writable));
2455 } 2459 }
2456 2460
2457 void RtpDataChannel::GetSrtpCryptoSuites_n( 2461 void RtpDataChannel::GetSrtpCryptoSuites_n(
2458 std::vector<int>* crypto_suites) const { 2462 std::vector<int>* crypto_suites) const {
2459 GetSupportedDataCryptoSuites(crypto_options(), crypto_suites); 2463 GetSupportedDataCryptoSuites(crypto_options(), crypto_suites);
2460 } 2464 }
2461 2465
2462 } // namespace cricket 2466 } // namespace cricket
OLDNEW
« 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