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

Side by Side Diff: webrtc/api/peerconnectioninterface.h

Issue 2043193003: Make the default value of rtcp-mux policy to required. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Merge with new changes. 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 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 // in the implementation. To do that, we need getter and setter 236 // in the implementation. To do that, we need getter and setter
237 // methods for all settings which are of interest to applications, 237 // methods for all settings which are of interest to applications,
238 // Chrome in particular. 238 // Chrome in particular.
239 239
240 RTCConfiguration() = default; 240 RTCConfiguration() = default;
241 RTCConfiguration(RTCConfigurationType type) { 241 RTCConfiguration(RTCConfigurationType type) {
242 if (type == RTCConfigurationType::kAggressive) { 242 if (type == RTCConfigurationType::kAggressive) {
243 // These parameters are also defined in Java and IOS configurations, 243 // These parameters are also defined in Java and IOS configurations,
244 // so their values may be overwritten by the Java or IOS configuration. 244 // so their values may be overwritten by the Java or IOS configuration.
245 bundle_policy = kBundlePolicyMaxBundle; 245 bundle_policy = kBundlePolicyMaxBundle;
246 rtcp_mux_policy = kRtcpMuxPolicyRequire; 246 rtcp_mux_policy = kRtcpMuxPolicyRequire;
honghaiz3 2016/11/23 17:52:49 As this is the same as the default value, this is
247 ice_connection_receiving_timeout = 247 ice_connection_receiving_timeout =
248 kAggressiveIceConnectionReceivingTimeout; 248 kAggressiveIceConnectionReceivingTimeout;
249 249
250 // These parameters are not defined in Java or IOS configuration, 250 // These parameters are not defined in Java or IOS configuration,
251 // so their values will not be overwritten. 251 // so their values will not be overwritten.
252 enable_ice_renomination = true; 252 enable_ice_renomination = true;
253 redetermine_role_on_ice_restart = false; 253 redetermine_role_on_ice_restart = false;
254 } 254 }
255 } 255 }
256 256
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 static const int kAudioJitterBufferMaxPackets = 50; 288 static const int kAudioJitterBufferMaxPackets = 50;
289 // ICE connection receiving timeout for aggressive configuration. 289 // ICE connection receiving timeout for aggressive configuration.
290 static const int kAggressiveIceConnectionReceivingTimeout = 1000; 290 static const int kAggressiveIceConnectionReceivingTimeout = 1000;
291 // TODO(pthatcher): Rename this ice_transport_type, but update 291 // TODO(pthatcher): Rename this ice_transport_type, but update
292 // Chromium at the same time. 292 // Chromium at the same time.
293 IceTransportsType type = kAll; 293 IceTransportsType type = kAll;
294 // TODO(pthatcher): Rename this ice_servers, but update Chromium 294 // TODO(pthatcher): Rename this ice_servers, but update Chromium
295 // at the same time. 295 // at the same time.
296 IceServers servers; 296 IceServers servers;
297 BundlePolicy bundle_policy = kBundlePolicyBalanced; 297 BundlePolicy bundle_policy = kBundlePolicyBalanced;
298 RtcpMuxPolicy rtcp_mux_policy = kRtcpMuxPolicyNegotiate; 298 RtcpMuxPolicy rtcp_mux_policy = kRtcpMuxPolicyRequire;
299 TcpCandidatePolicy tcp_candidate_policy = kTcpCandidatePolicyEnabled; 299 TcpCandidatePolicy tcp_candidate_policy = kTcpCandidatePolicyEnabled;
300 CandidateNetworkPolicy candidate_network_policy = 300 CandidateNetworkPolicy candidate_network_policy =
301 kCandidateNetworkPolicyAll; 301 kCandidateNetworkPolicyAll;
302 int audio_jitter_buffer_max_packets = kAudioJitterBufferMaxPackets; 302 int audio_jitter_buffer_max_packets = kAudioJitterBufferMaxPackets;
303 bool audio_jitter_buffer_fast_accelerate = false; 303 bool audio_jitter_buffer_fast_accelerate = false;
304 int ice_connection_receiving_timeout = kUndefined; // ms 304 int ice_connection_receiving_timeout = kUndefined; // ms
305 int ice_backup_candidate_pair_ping_interval = kUndefined; // ms 305 int ice_backup_candidate_pair_ping_interval = kUndefined; // ms
306 ContinualGatheringPolicy continual_gathering_policy = GATHER_ONCE; 306 ContinualGatheringPolicy continual_gathering_policy = GATHER_ONCE;
307 std::vector<rtc::scoped_refptr<rtc::RTCCertificate>> certificates; 307 std::vector<rtc::scoped_refptr<rtc::RTCCertificate>> certificates;
308 bool prioritize_most_likely_ice_candidate_pairs = false; 308 bool prioritize_most_likely_ice_candidate_pairs = false;
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 cricket::WebRtcVideoEncoderFactory* encoder_factory, 769 cricket::WebRtcVideoEncoderFactory* encoder_factory,
770 cricket::WebRtcVideoDecoderFactory* decoder_factory) { 770 cricket::WebRtcVideoDecoderFactory* decoder_factory) {
771 return CreatePeerConnectionFactory( 771 return CreatePeerConnectionFactory(
772 worker_and_network_thread, worker_and_network_thread, signaling_thread, 772 worker_and_network_thread, worker_and_network_thread, signaling_thread,
773 default_adm, encoder_factory, decoder_factory); 773 default_adm, encoder_factory, decoder_factory);
774 } 774 }
775 775
776 } // namespace webrtc 776 } // namespace webrtc
777 777
778 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 778 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « webrtc/api/android/java/src/org/webrtc/PeerConnection.java ('k') | webrtc/api/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698