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

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

Issue 2721163002: Add support for RTCConfiguration.iceCandidatePoolSize. (Closed)
Patch Set: Merge with master Created 3 years, 9 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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 NOTREACHED(); 291 NOTREACHED();
292 } 292 }
293 293
294 webrtc_config->certificates.clear(); 294 webrtc_config->certificates.clear();
295 for (const std::unique_ptr<blink::WebRTCCertificate>& blink_certificate : 295 for (const std::unique_ptr<blink::WebRTCCertificate>& blink_certificate :
296 blink_config.certificates) { 296 blink_config.certificates) {
297 webrtc_config->certificates.push_back( 297 webrtc_config->certificates.push_back(
298 static_cast<RTCCertificate*>(blink_certificate.get()) 298 static_cast<RTCCertificate*>(blink_certificate.get())
299 ->rtcCertificate()); 299 ->rtcCertificate());
300 } 300 }
301
302 webrtc_config->ice_candidate_pool_size = blink_config.iceCandidatePoolSize;
301 } 303 }
302 304
303 void CopyConstraintsIntoRtcConfiguration( 305 void CopyConstraintsIntoRtcConfiguration(
304 const blink::WebMediaConstraints constraints, 306 const blink::WebMediaConstraints constraints,
305 webrtc::PeerConnectionInterface::RTCConfiguration* configuration) { 307 webrtc::PeerConnectionInterface::RTCConfiguration* configuration) {
306 // Copy info from constraints into configuration, if present. 308 // Copy info from constraints into configuration, if present.
307 if (constraints.isEmpty()) { 309 if (constraints.isEmpty()) {
308 return; 310 return;
309 } 311 }
310 312
(...skipping 1692 matching lines...) Expand 10 before | Expand all | Expand 10 after
2003 } 2005 }
2004 2006
2005 void RTCPeerConnectionHandler::ResetUMAStats() { 2007 void RTCPeerConnectionHandler::ResetUMAStats() {
2006 DCHECK(thread_checker_.CalledOnValidThread()); 2008 DCHECK(thread_checker_.CalledOnValidThread());
2007 num_local_candidates_ipv6_ = 0; 2009 num_local_candidates_ipv6_ = 0;
2008 num_local_candidates_ipv4_ = 0; 2010 num_local_candidates_ipv4_ = 0;
2009 ice_connection_checking_start_ = base::TimeTicks(); 2011 ice_connection_checking_start_ = base::TimeTicks();
2010 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); 2012 memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
2011 } 2013 }
2012 } // namespace content 2014 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/peer_connection_tracker.cc ('k') | content/test/data/media/peerconnection-setConfiguration.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698