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

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

Issue 2055553003: Change the default rtcp mux policy from negotiate to require. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove the histogram. 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
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 1378 matching lines...) Expand 10 before | Expand all | Expand 10 after
1389 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::updateICE"); 1389 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::updateICE");
1390 webrtc::PeerConnectionInterface::RTCConfiguration config; 1390 webrtc::PeerConnectionInterface::RTCConfiguration config;
1391 GetNativeRtcConfiguration(server_configuration, &config); 1391 GetNativeRtcConfiguration(server_configuration, &config);
1392 1392
1393 if (peer_connection_tracker_) 1393 if (peer_connection_tracker_)
1394 peer_connection_tracker_->TrackUpdateIce(this, config); 1394 peer_connection_tracker_->TrackUpdateIce(this, config);
1395 1395
1396 return native_peer_connection_->UpdateIce(config.servers); 1396 return native_peer_connection_->UpdateIce(config.servers);
1397 } 1397 }
1398 1398
1399 void RTCPeerConnectionHandler::logSelectedRtcpMuxPolicy(
1400 blink::RtcpMuxPolicy selectedRtcpMuxPolicy) {
1401 UMA_HISTOGRAM_ENUMERATION("WebRTC.PeerConnection.SelectedRtcpMuxPolicy",
1402 selectedRtcpMuxPolicy, blink::RtcpMuxPolicyMax);
1403 }
1404
1405 bool RTCPeerConnectionHandler::addICECandidate( 1399 bool RTCPeerConnectionHandler::addICECandidate(
1406 const blink::WebRTCVoidRequest& request, 1400 const blink::WebRTCVoidRequest& request,
1407 const blink::WebRTCICECandidate& candidate) { 1401 const blink::WebRTCICECandidate& candidate) {
1408 DCHECK(thread_checker_.CalledOnValidThread()); 1402 DCHECK(thread_checker_.CalledOnValidThread());
1409 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::addICECandidate"); 1403 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::addICECandidate");
1410 // Libjingle currently does not accept callbacks for addICECandidate. 1404 // Libjingle currently does not accept callbacks for addICECandidate.
1411 // For that reason we are going to call callbacks from here. 1405 // For that reason we are going to call callbacks from here.
1412 1406
1413 // TODO(tommi): Instead of calling addICECandidate here, we can do a 1407 // TODO(tommi): Instead of calling addICECandidate here, we can do a
1414 // PostTaskAndReply kind of a thing. 1408 // PostTaskAndReply kind of a thing.
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
1955 } 1949 }
1956 1950
1957 void RTCPeerConnectionHandler::ResetUMAStats() { 1951 void RTCPeerConnectionHandler::ResetUMAStats() {
1958 DCHECK(thread_checker_.CalledOnValidThread()); 1952 DCHECK(thread_checker_.CalledOnValidThread());
1959 num_local_candidates_ipv6_ = 0; 1953 num_local_candidates_ipv6_ = 0;
1960 num_local_candidates_ipv4_ = 0; 1954 num_local_candidates_ipv4_ = 0;
1961 ice_connection_checking_start_ = base::TimeTicks(); 1955 ice_connection_checking_start_ = base::TimeTicks();
1962 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); 1956 memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
1963 } 1957 }
1964 } // namespace content 1958 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698