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

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

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/peerconnection.cc ('k') | webrtc/api/peerconnectioninterface_unittest.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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 kIceConnectionClosed, 168 kIceConnectionClosed,
169 kIceConnectionMax, 169 kIceConnectionMax,
170 }; 170 };
171 171
172 struct IceServer { 172 struct IceServer {
173 // TODO(jbauch): Remove uri when all code using it has switched to urls. 173 // TODO(jbauch): Remove uri when all code using it has switched to urls.
174 std::string uri; 174 std::string uri;
175 std::vector<std::string> urls; 175 std::vector<std::string> urls;
176 std::string username; 176 std::string username;
177 std::string password; 177 std::string password;
178 bool operator==(const IceServer& o) const {
179 return uri == o.uri && urls == o.urls && username == o.username &&
180 password == o.password;
181 }
182 bool operator!=(const IceServer& o) const { return !(*this == o); }
178 }; 183 };
179 typedef std::vector<IceServer> IceServers; 184 typedef std::vector<IceServer> IceServers;
180 185
181 enum IceTransportsType { 186 enum IceTransportsType {
182 // TODO(pthatcher): Rename these kTransporTypeXXX, but update 187 // TODO(pthatcher): Rename these kTransporTypeXXX, but update
183 // Chromium at the same time. 188 // Chromium at the same time.
184 kNone, 189 kNone,
185 kRelay, 190 kRelay,
186 kNoHost, 191 kNoHost,
187 kAll 192 kAll
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 cricket::WebRtcVideoEncoderFactory* encoder_factory, 774 cricket::WebRtcVideoEncoderFactory* encoder_factory,
770 cricket::WebRtcVideoDecoderFactory* decoder_factory) { 775 cricket::WebRtcVideoDecoderFactory* decoder_factory) {
771 return CreatePeerConnectionFactory( 776 return CreatePeerConnectionFactory(
772 worker_and_network_thread, worker_and_network_thread, signaling_thread, 777 worker_and_network_thread, worker_and_network_thread, signaling_thread,
773 default_adm, encoder_factory, decoder_factory); 778 default_adm, encoder_factory, decoder_factory);
774 } 779 }
775 780
776 } // namespace webrtc 781 } // namespace webrtc
777 782
778 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 783 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « webrtc/api/peerconnection.cc ('k') | webrtc/api/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698