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

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

Issue 1671173002: Track pending ICE restarts independently for different media sections. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Extend ICE restart test to check that a second answer has new credentials. Created 4 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 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 12 matching lines...) Expand all
23 #include "webrtc/api/webrtcsession.h" 23 #include "webrtc/api/webrtcsession.h"
24 #include "webrtc/base/scoped_ptr.h" 24 #include "webrtc/base/scoped_ptr.h"
25 25
26 namespace webrtc { 26 namespace webrtc {
27 27
28 class MediaStreamObserver; 28 class MediaStreamObserver;
29 class RemoteMediaStreamFactory; 29 class RemoteMediaStreamFactory;
30 30
31 // Populates |session_options| from |rtc_options|, and returns true if options 31 // Populates |session_options| from |rtc_options|, and returns true if options
32 // are valid. 32 // are valid.
33 // Assumes that |session_options|->transport_options map entries exist.
pthatcher1 2016/02/17 06:46:58 Assumes which entries exist?
Taylor Brandstetter 2016/02/17 21:43:50 The entries that the caller wants populated accord
33 bool ConvertRtcOptionsForOffer( 34 bool ConvertRtcOptionsForOffer(
34 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options, 35 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options,
35 cricket::MediaSessionOptions* session_options); 36 cricket::MediaSessionOptions* session_options);
36 37
37 // Populates |session_options| from |constraints|, and returns true if all 38 // Populates |session_options| from |constraints|, and returns true if all
38 // mandatory constraints are satisfied. 39 // mandatory constraints are satisfied.
40 // Assumes that |session_options|->transport_options map entries exist.
39 bool ParseConstraintsForAnswer(const MediaConstraintsInterface* constraints, 41 bool ParseConstraintsForAnswer(const MediaConstraintsInterface* constraints,
40 cricket::MediaSessionOptions* session_options); 42 cricket::MediaSessionOptions* session_options);
41 43
42 // Parses the URLs for each server in |servers| to build |stun_servers| and 44 // Parses the URLs for each server in |servers| to build |stun_servers| and
43 // |turn_servers|. 45 // |turn_servers|.
44 bool ParseIceServers(const PeerConnectionInterface::IceServers& servers, 46 bool ParseIceServers(const PeerConnectionInterface::IceServers& servers,
45 cricket::ServerAddresses* stun_servers, 47 cricket::ServerAddresses* stun_servers,
46 std::vector<cricket::RelayServerConfig>* turn_servers); 48 std::vector<cricket::RelayServerConfig>* turn_servers);
47 49
48 // PeerConnection implements the PeerConnectionInterface interface. 50 // PeerConnection implements the PeerConnectionInterface interface.
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 // because its destruction fires signals (such as VoiceChannelDestroyed) 375 // because its destruction fires signals (such as VoiceChannelDestroyed)
374 // which will trigger some final actions in PeerConnection... 376 // which will trigger some final actions in PeerConnection...
375 rtc::scoped_ptr<WebRtcSession> session_; 377 rtc::scoped_ptr<WebRtcSession> session_;
376 // ... But stats_ depends on session_ so it should be destroyed even earlier. 378 // ... But stats_ depends on session_ so it should be destroyed even earlier.
377 rtc::scoped_ptr<StatsCollector> stats_; 379 rtc::scoped_ptr<StatsCollector> stats_;
378 }; 380 };
379 381
380 } // namespace webrtc 382 } // namespace webrtc
381 383
382 #endif // WEBRTC_API_PEERCONNECTION_H_ 384 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698