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

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

Issue 2563153002: Implement the "needs-ice-restart" logic for SetConfiguration. (Closed)
Patch Set: Fixing find/replace mistake. 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
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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 virtual bool GetLocalCertificate( 271 virtual bool GetLocalCertificate(
272 const std::string& transport_name, 272 const std::string& transport_name,
273 rtc::scoped_refptr<rtc::RTCCertificate>* certificate); 273 rtc::scoped_refptr<rtc::RTCCertificate>* certificate);
274 274
275 // Caller owns returned certificate 275 // Caller owns returned certificate
276 virtual std::unique_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate( 276 virtual std::unique_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate(
277 const std::string& transport_name); 277 const std::string& transport_name);
278 278
279 cricket::DataChannelType data_channel_type() const; 279 cricket::DataChannelType data_channel_type() const;
280 280
281 // Returns true if there was an ICE restart initiated by the remote offer.
281 bool IceRestartPending(const std::string& content_name) const; 282 bool IceRestartPending(const std::string& content_name) const;
282 283
284 // Set the "needs-ice-restart" flag as described in JSEP.
285 void SetNeedsIceRestartFlag();
286 // Returns true if the ICE restart flag above was set, and no ICE restart has
287 // occurred yet for |transport_name|. If the transport has been deleted as a
288 // result of bundling, returns false.
289 bool NeedsIceRestart(const std::string& transport_name) const;
pthatcher1 2016/12/10 02:26:31 Can we just call these MIDs? If not, why is it co
Taylor Brandstetter 2016/12/10 19:00:35 I'll call it content_name here too for consistency
290
283 // Called when an RTCCertificate is generated or retrieved by 291 // Called when an RTCCertificate is generated or retrieved by
284 // WebRTCSessionDescriptionFactory. Should happen before setLocalDescription. 292 // WebRTCSessionDescriptionFactory. Should happen before setLocalDescription.
285 void OnCertificateReady( 293 void OnCertificateReady(
286 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate); 294 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate);
287 void OnDtlsSetupFailure(cricket::BaseChannel*, bool rtcp); 295 void OnDtlsSetupFailure(cricket::BaseChannel*, bool rtcp);
288 296
289 // For unit test. 297 // For unit test.
290 bool waiting_for_certificate_for_testing() const; 298 bool waiting_for_certificate_for_testing() const;
291 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate_for_testing(); 299 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate_for_testing();
292 300
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 528
521 #ifdef HAVE_QUIC 529 #ifdef HAVE_QUIC
522 std::unique_ptr<QuicDataTransport> quic_data_transport_; 530 std::unique_ptr<QuicDataTransport> quic_data_transport_;
523 #endif // HAVE_QUIC 531 #endif // HAVE_QUIC
524 532
525 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 533 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
526 }; 534 };
527 } // namespace webrtc 535 } // namespace webrtc
528 536
529 #endif // WEBRTC_API_WEBRTCSESSION_H_ 537 #endif // WEBRTC_API_WEBRTCSESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698