commit be0c96fd00d2fae1f461eb79b4ffbd6ff17428d5
author deadbeef <deadbeef@webrtc.org> Wed May 18 16:20:14 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed May 18 23:20:18 2016 +0000
tree 9b4e1cca982bd6157806e72335f8e9acdc3582b4
parent b711f10d9683b9de6ee78186f77b225fc7ebfb8f

Add ice_candidate_pool_size to Obj-C and Java RTCConfiguration.

Review-Url: https://codereview.webrtc.org/1986073004
Cr-Commit-Position: refs/heads/master@{#12801}

webrtc/api/java/jni/peerconnection_jni.cc

diff --git a/webrtc/api/java/jni/peerconnection_jni.cc b/webrtc/api/java/jni/peerconnection_jni.cc
index 165d6da..b4a22ed 100644
--- a/webrtc/api/java/jni/peerconnection_jni.cc
+++ b/webrtc/api/java/jni/peerconnection_jni.cc
@@ -1545,6 +1545,9 @@
   jobject j_continual_gathering_policy =
       GetObjectField(jni, j_rtc_config, j_continual_gathering_policy_id);
 
+  jfieldID j_ice_candidate_pool_size_id =
+      GetFieldID(jni, j_rtc_config_class, "iceCandidatePoolSize", "I");
+
   rtc_config->type =
       JavaIceTransportsTypeToNativeType(jni, j_ice_transports_type);
   rtc_config->bundle_policy =
@@ -1565,6 +1568,8 @@
   rtc_config->continual_gathering_policy =
       JavaContinualGatheringPolicyToNativeType(
           jni, j_continual_gathering_policy);
+  rtc_config->ice_candidate_pool_size =
+      GetIntField(jni, j_rtc_config, j_ice_candidate_pool_size_id);
 }
 
 JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)(

webrtc/api/java/src/org/webrtc/PeerConnection.java

diff --git a/webrtc/api/java/src/org/webrtc/PeerConnection.java b/webrtc/api/java/src/org/webrtc/PeerConnection.java
index 5f52619..c112d27 100644
--- a/webrtc/api/java/src/org/webrtc/PeerConnection.java
+++ b/webrtc/api/java/src/org/webrtc/PeerConnection.java
@@ -139,6 +139,7 @@
     public int iceBackupCandidatePairPingInterval;
     public KeyType keyType;
     public ContinualGatheringPolicy continualGatheringPolicy;
+    public int iceCandidatePoolSize;
 
     public RTCConfiguration(List<IceServer> iceServers) {
       iceTransportsType = IceTransportsType.ALL;
@@ -152,6 +153,7 @@
       iceBackupCandidatePairPingInterval = -1;
       keyType = KeyType.ECDSA;
       continualGatheringPolicy = ContinualGatheringPolicy.GATHER_ONCE;
+      iceCandidatePoolSize = 0;
     }
   };