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

Side by Side Diff: content/renderer/media/rtc_peer_connection_handler.cc

Issue 2813883004: Remove RTCIceTransportPolicy "none". (Closed)
Patch Set: Created 3 years, 8 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/rtc_peer_connection_handler.h" 5 #include "content/renderer/media/rtc_peer_connection_handler.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 webrtc_config->servers.clear(); 243 webrtc_config->servers.clear();
244 for (const blink::WebRTCIceServer& blink_server : blink_config.ice_servers) { 244 for (const blink::WebRTCIceServer& blink_server : blink_config.ice_servers) {
245 webrtc::PeerConnectionInterface::IceServer server; 245 webrtc::PeerConnectionInterface::IceServer server;
246 server.username = blink_server.username.Utf8(); 246 server.username = blink_server.username.Utf8();
247 server.password = blink_server.credential.Utf8(); 247 server.password = blink_server.credential.Utf8();
248 server.uri = blink_server.url.GetString().Utf8(); 248 server.uri = blink_server.url.GetString().Utf8();
249 webrtc_config->servers.push_back(server); 249 webrtc_config->servers.push_back(server);
250 } 250 }
251 251
252 switch (blink_config.ice_transport_policy) { 252 switch (blink_config.ice_transport_policy) {
253 case blink::WebRTCIceTransportPolicy::kNone:
254 webrtc_config->type = webrtc::PeerConnectionInterface::kNone;
foolip 2017/04/12 13:02:39 webrtc::PeerConnectionInterface::kNone will remain
hbos_chromium 2017/04/13 11:33:42 Possibly, I filed https://bugs.webrtc.org/7486
255 break;
256 case blink::WebRTCIceTransportPolicy::kRelay: 253 case blink::WebRTCIceTransportPolicy::kRelay:
257 webrtc_config->type = webrtc::PeerConnectionInterface::kRelay; 254 webrtc_config->type = webrtc::PeerConnectionInterface::kRelay;
258 break; 255 break;
259 case blink::WebRTCIceTransportPolicy::kAll: 256 case blink::WebRTCIceTransportPolicy::kAll:
260 webrtc_config->type = webrtc::PeerConnectionInterface::kAll; 257 webrtc_config->type = webrtc::PeerConnectionInterface::kAll;
261 break; 258 break;
262 default: 259 default:
263 NOTREACHED(); 260 NOTREACHED();
264 } 261 }
265 262
(...skipping 1814 matching lines...) Expand 10 before | Expand all | Expand 10 after
2080 } 2077 }
2081 2078
2082 void RTCPeerConnectionHandler::ResetUMAStats() { 2079 void RTCPeerConnectionHandler::ResetUMAStats() {
2083 DCHECK(thread_checker_.CalledOnValidThread()); 2080 DCHECK(thread_checker_.CalledOnValidThread());
2084 num_local_candidates_ipv6_ = 0; 2081 num_local_candidates_ipv6_ = 0;
2085 num_local_candidates_ipv4_ = 0; 2082 num_local_candidates_ipv4_ = 0;
2086 ice_connection_checking_start_ = base::TimeTicks(); 2083 ice_connection_checking_start_ = base::TimeTicks();
2087 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); 2084 memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
2088 } 2085 }
2089 } // namespace content 2086 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698