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

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

Issue 2447033002: Support RTCConfiguration iceTransportPolicy (Closed)
Patch Set: update expectations Created 4 years, 1 month 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 | « no previous file | third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-expected.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 for (const blink::WebRTCIceServer& blink_server : blink_config.iceServers) { 197 for (const blink::WebRTCIceServer& blink_server : blink_config.iceServers) {
198 webrtc::PeerConnectionInterface::IceServer server; 198 webrtc::PeerConnectionInterface::IceServer server;
199 server.username = 199 server.username =
200 base::UTF16ToUTF8(base::StringPiece16(blink_server.username)); 200 base::UTF16ToUTF8(base::StringPiece16(blink_server.username));
201 server.password = 201 server.password =
202 base::UTF16ToUTF8(base::StringPiece16(blink_server.credential)); 202 base::UTF16ToUTF8(base::StringPiece16(blink_server.credential));
203 server.uri = blink_server.url.string().utf8(); 203 server.uri = blink_server.url.string().utf8();
204 webrtc_config->servers.push_back(server); 204 webrtc_config->servers.push_back(server);
205 } 205 }
206 206
207 switch (blink_config.iceTransports) { 207 switch (blink_config.iceTransportPolicy) {
208 case blink::WebRTCIceTransports::kNone: 208 case blink::WebRTCIceTransportPolicy::kNone:
209 webrtc_config->type = webrtc::PeerConnectionInterface::kNone; 209 webrtc_config->type = webrtc::PeerConnectionInterface::kNone;
210 break; 210 break;
211 case blink::WebRTCIceTransports::kRelay: 211 case blink::WebRTCIceTransportPolicy::kRelay:
212 webrtc_config->type = webrtc::PeerConnectionInterface::kRelay; 212 webrtc_config->type = webrtc::PeerConnectionInterface::kRelay;
213 break; 213 break;
214 case blink::WebRTCIceTransports::kAll: 214 case blink::WebRTCIceTransportPolicy::kAll:
215 webrtc_config->type = webrtc::PeerConnectionInterface::kAll; 215 webrtc_config->type = webrtc::PeerConnectionInterface::kAll;
216 break; 216 break;
217 default: 217 default:
218 NOTREACHED(); 218 NOTREACHED();
219 } 219 }
220 220
221 switch (blink_config.bundlePolicy) { 221 switch (blink_config.bundlePolicy) {
222 case blink::WebRTCBundlePolicy::kBalanced: 222 case blink::WebRTCBundlePolicy::kBalanced:
223 webrtc_config->bundle_policy = 223 webrtc_config->bundle_policy =
224 webrtc::PeerConnectionInterface::kBundlePolicyBalanced; 224 webrtc::PeerConnectionInterface::kBundlePolicyBalanced;
(...skipping 1730 matching lines...) Expand 10 before | Expand all | Expand 10 after
1955 } 1955 }
1956 1956
1957 void RTCPeerConnectionHandler::ResetUMAStats() { 1957 void RTCPeerConnectionHandler::ResetUMAStats() {
1958 DCHECK(thread_checker_.CalledOnValidThread()); 1958 DCHECK(thread_checker_.CalledOnValidThread());
1959 num_local_candidates_ipv6_ = 0; 1959 num_local_candidates_ipv6_ = 0;
1960 num_local_candidates_ipv4_ = 0; 1960 num_local_candidates_ipv4_ = 0;
1961 ice_connection_checking_start_ = base::TimeTicks(); 1961 ice_connection_checking_start_ = base::TimeTicks();
1962 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); 1962 memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
1963 } 1963 }
1964 } // namespace content 1964 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/fast/peerconnection/RTCPeerConnection-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698