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

Side by Side Diff: webrtc/api/webrtcsession.cc

Issue 2563153002: Implement the "needs-ice-restart" logic for SetConfiguration. (Closed)
Patch Set: Fixing signed/unsigned comparison warning. Created 4 years 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/api/webrtcsession.h ('k') | webrtc/api/webrtcsessiondescriptionfactory.cc » ('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 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after
1323 1323
1324 cricket::DataChannelType WebRtcSession::data_channel_type() const { 1324 cricket::DataChannelType WebRtcSession::data_channel_type() const {
1325 return data_channel_type_; 1325 return data_channel_type_;
1326 } 1326 }
1327 1327
1328 bool WebRtcSession::IceRestartPending(const std::string& content_name) const { 1328 bool WebRtcSession::IceRestartPending(const std::string& content_name) const {
1329 return pending_ice_restarts_.find(content_name) != 1329 return pending_ice_restarts_.find(content_name) !=
1330 pending_ice_restarts_.end(); 1330 pending_ice_restarts_.end();
1331 } 1331 }
1332 1332
1333 void WebRtcSession::SetNeedsIceRestartFlag() {
1334 transport_controller_->SetNeedsIceRestartFlag();
1335 }
1336
1337 bool WebRtcSession::NeedsIceRestart(const std::string& content_name) const {
1338 return transport_controller_->NeedsIceRestart(content_name);
1339 }
1340
1333 void WebRtcSession::OnCertificateReady( 1341 void WebRtcSession::OnCertificateReady(
1334 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) { 1342 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate) {
1335 transport_controller_->SetLocalCertificate(certificate); 1343 transport_controller_->SetLocalCertificate(certificate);
1336 } 1344 }
1337 1345
1338 bool WebRtcSession::waiting_for_certificate_for_testing() const { 1346 bool WebRtcSession::waiting_for_certificate_for_testing() const {
1339 return webrtc_session_desc_factory_->waiting_for_certificate_for_testing(); 1347 return webrtc_session_desc_factory_->waiting_for_certificate_for_testing();
1340 } 1348 }
1341 1349
1342 const rtc::scoped_refptr<rtc::RTCCertificate>& 1350 const rtc::scoped_refptr<rtc::RTCCertificate>&
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
2079 } 2087 }
2080 2088
2081 void WebRtcSession::OnDtlsHandshakeError(rtc::SSLHandshakeError error) { 2089 void WebRtcSession::OnDtlsHandshakeError(rtc::SSLHandshakeError error) {
2082 if (metrics_observer_) { 2090 if (metrics_observer_) {
2083 metrics_observer_->IncrementEnumCounter( 2091 metrics_observer_->IncrementEnumCounter(
2084 webrtc::kEnumCounterDtlsHandshakeError, static_cast<int>(error), 2092 webrtc::kEnumCounterDtlsHandshakeError, static_cast<int>(error),
2085 static_cast<int>(rtc::SSLHandshakeError::MAX_VALUE)); 2093 static_cast<int>(rtc::SSLHandshakeError::MAX_VALUE));
2086 } 2094 }
2087 } 2095 }
2088 } // namespace webrtc 2096 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/webrtcsession.h ('k') | webrtc/api/webrtcsessiondescriptionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698