From aecd982a6fddb0ebf81caefb08bb30f4b36a1841 Mon Sep 17 00:00:00 2001 From: Honghai Zhang Date: Fri, 2 Sep 2016 16:58:17 -0700 Subject: [PATCH] Change a few configurations in AggressiveConfiguration Set bundle policy to max bundle. Set rtcp mux policy to required. Set enable ice renomination to true. This configuration is used by native applications. R=pthatcher@webrtc.org, skvlad@webrtc.org Review URL: https://codereview.webrtc.org/2299713002 . Cr-Commit-Position: refs/heads/master@{#14057} --- webrtc/api/peerconnectioninterface.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/webrtc/api/peerconnectioninterface.h b/webrtc/api/peerconnectioninterface.h index 8ba2460fa7..f5d8c63b67 100644 --- a/webrtc/api/peerconnectioninterface.h +++ b/webrtc/api/peerconnectioninterface.h @@ -252,6 +252,16 @@ class PeerConnectionInterface : public rtc::RefCountInterface { RTCConfiguration() = default; RTCConfiguration(RTCConfigurationType type) { if (type == RTCConfigurationType::kAggressive) { + // These parameters are also defined in Java and IOS configurations, + // so their values may be overwritten by the Java or IOS configuration. + bundle_policy = kBundlePolicyMaxBundle; + rtcp_mux_policy = kRtcpMuxPolicyRequire; + ice_connection_receiving_timeout = + kAggressiveIceConnectionReceivingTimeout; + + // These parameters are not defined in Java or IOS configuration, + // so their values will not be overwritten. + enable_ice_renomination = true; redetermine_role_on_ice_restart = false; } } @@ -288,6 +298,8 @@ class PeerConnectionInterface : public rtc::RefCountInterface { static const int kUndefined = -1; // Default maximum number of packets in the audio jitter buffer. static const int kAudioJitterBufferMaxPackets = 50; + // ICE connection receiving timeout for aggressive configuration. + static const int kAggressiveIceConnectionReceivingTimeout = 1000; // TODO(pthatcher): Rename this ice_transport_type, but update // Chromium at the same time. IceTransportsType type = kAll;