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

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

Issue 1321543002: Enable generation of local host candidate when RTCConfiguration is null. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « no previous file | no next file » | 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> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 description->ToString(sdp); 178 description->ToString(sdp);
179 *type = description->type(); 179 *type = description->type();
180 } 180 }
181 } 181 }
182 182
183 // Converter functions from WebKit types to WebRTC types. 183 // Converter functions from WebKit types to WebRTC types.
184 184
185 void GetNativeRtcConfiguration( 185 void GetNativeRtcConfiguration(
186 const blink::WebRTCConfiguration& blink_config, 186 const blink::WebRTCConfiguration& blink_config,
187 webrtc::PeerConnectionInterface::RTCConfiguration* webrtc_config) { 187 webrtc::PeerConnectionInterface::RTCConfiguration* webrtc_config) {
188 if (blink_config.isNull() || !webrtc_config) 188 if (!webrtc_config)
189 return; 189 return;
190
191 // When we don't have WebRTCConfiguration, treat it as a special case where we
192 // should generate local host candidate. This will only be honored if
193 // enable_multiple_routes is disabled.
194 if (blink_config.isNull()) {
195 webrtc_config->enable_localhost_ice_candidate = true;
196 return;
197 }
198
199 webrtc_config->enable_localhost_ice_candidate =
juberti 2015/08/28 00:24:49 What does this do, exactly?
200 blink_config.enableLocalhostCandidate();
201
190 for (size_t i = 0; i < blink_config.numberOfServers(); ++i) { 202 for (size_t i = 0; i < blink_config.numberOfServers(); ++i) {
191 webrtc::PeerConnectionInterface::IceServer server; 203 webrtc::PeerConnectionInterface::IceServer server;
192 const blink::WebRTCICEServer& webkit_server = 204 const blink::WebRTCICEServer& webkit_server =
193 blink_config.server(i); 205 blink_config.server(i);
194 server.username = 206 server.username =
195 base::UTF16ToUTF8(base::StringPiece16(webkit_server.username())); 207 base::UTF16ToUTF8(base::StringPiece16(webkit_server.username()));
196 server.password = 208 server.password =
197 base::UTF16ToUTF8(base::StringPiece16(webkit_server.credential())); 209 base::UTF16ToUTF8(base::StringPiece16(webkit_server.credential()));
198 server.uri = webkit_server.uri().spec(); 210 server.uri = webkit_server.uri().spec();
199 webrtc_config->servers.push_back(server); 211 webrtc_config->servers.push_back(server);
(...skipping 1411 matching lines...) Expand 10 before | Expand all | Expand 10 after
1611 } 1623 }
1612 1624
1613 void RTCPeerConnectionHandler::ResetUMAStats() { 1625 void RTCPeerConnectionHandler::ResetUMAStats() {
1614 DCHECK(thread_checker_.CalledOnValidThread()); 1626 DCHECK(thread_checker_.CalledOnValidThread());
1615 num_local_candidates_ipv6_ = 0; 1627 num_local_candidates_ipv6_ = 0;
1616 num_local_candidates_ipv4_ = 0; 1628 num_local_candidates_ipv4_ = 0;
1617 ice_connection_checking_start_ = base::TimeTicks(); 1629 ice_connection_checking_start_ = base::TimeTicks();
1618 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); 1630 memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
1619 } 1631 }
1620 } // namespace content 1632 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698