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

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: fix test 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 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1391 DCHECK(thread_checker_.CalledOnValidThread()); 1391 DCHECK(thread_checker_.CalledOnValidThread());
1392 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::setConfiguration"); 1392 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::setConfiguration");
1393 GetNativeRtcConfiguration(blink_config, &configuration_); 1393 GetNativeRtcConfiguration(blink_config, &configuration_);
1394 1394
1395 if (peer_connection_tracker_) 1395 if (peer_connection_tracker_)
1396 peer_connection_tracker_->TrackSetConfiguration(this, configuration_); 1396 peer_connection_tracker_->TrackSetConfiguration(this, configuration_);
1397 1397
1398 return native_peer_connection_->SetConfiguration(configuration_); 1398 return native_peer_connection_->SetConfiguration(configuration_);
1399 } 1399 }
1400 1400
1401 void RTCPeerConnectionHandler::logSelectedRtcpMuxPolicy(
1402 blink::RtcpMuxPolicy selectedRtcpMuxPolicy) {
1403 UMA_HISTOGRAM_ENUMERATION("WebRTC.PeerConnection.SelectedRtcpMuxPolicy",
1404 selectedRtcpMuxPolicy, blink::RtcpMuxPolicyMax);
1405 }
1406
1407 bool RTCPeerConnectionHandler::addICECandidate( 1401 bool RTCPeerConnectionHandler::addICECandidate(
1408 const blink::WebRTCVoidRequest& request, 1402 const blink::WebRTCVoidRequest& request,
1409 const blink::WebRTCICECandidate& candidate) { 1403 const blink::WebRTCICECandidate& candidate) {
1410 DCHECK(thread_checker_.CalledOnValidThread()); 1404 DCHECK(thread_checker_.CalledOnValidThread());
1411 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::addICECandidate"); 1405 TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::addICECandidate");
1412 // Libjingle currently does not accept callbacks for addICECandidate. 1406 // Libjingle currently does not accept callbacks for addICECandidate.
1413 // For that reason we are going to call callbacks from here. 1407 // For that reason we are going to call callbacks from here.
1414 1408
1415 // TODO(tommi): Instead of calling addICECandidate here, we can do a 1409 // TODO(tommi): Instead of calling addICECandidate here, we can do a
1416 // PostTaskAndReply kind of a thing. 1410 // PostTaskAndReply kind of a thing.
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
1957 } 1951 }
1958 1952
1959 void RTCPeerConnectionHandler::ResetUMAStats() { 1953 void RTCPeerConnectionHandler::ResetUMAStats() {
1960 DCHECK(thread_checker_.CalledOnValidThread()); 1954 DCHECK(thread_checker_.CalledOnValidThread());
1961 num_local_candidates_ipv6_ = 0; 1955 num_local_candidates_ipv6_ = 0;
1962 num_local_candidates_ipv4_ = 0; 1956 num_local_candidates_ipv4_ = 0;
1963 ice_connection_checking_start_ = base::TimeTicks(); 1957 ice_connection_checking_start_ = base::TimeTicks();
1964 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); 1958 memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
1965 } 1959 }
1966 } // namespace content 1960 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698