Index: talk/app/webrtc/java/jni/peerconnection_jni.cc |
diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc |
index 503a75ee88d35029c5c9a3664c3ffbcf7b3d817b..8799931a810f34143b4dc235b453908f3b350d51 100644 |
--- a/talk/app/webrtc/java/jni/peerconnection_jni.cc |
+++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc |
@@ -1341,13 +1341,15 @@ JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)( |
"Ljava/util/List;"); |
jobject j_ice_servers = GetObjectField(jni, j_rtc_config, j_ice_servers_id); |
- jfieldID j_audio_jitter_buffer_max_packets_id = GetFieldID( |
- jni, j_rtc_config_class, "audioJitterBufferMaxPackets", |
- "I"); |
+ jfieldID j_audio_jitter_buffer_max_packets_id = |
+ GetFieldID(jni, j_rtc_config_class, "audioJitterBufferMaxPackets", "I"); |
jfieldID j_audio_jitter_buffer_fast_accelerate_id = GetFieldID( |
jni, j_rtc_config_class, "audioJitterBufferFastAccelerate", "Z"); |
- PeerConnectionInterface::RTCConfiguration rtc_config; |
+ jfieldID j_ice_connection_receiving_timeout_id = |
+ GetFieldID(jni, j_rtc_config_class, "iceConnectionReceivingTimeout", "I"); |
+ |
+ PeerConnectionInterface::RTCConfiguration rtc_config; |
rtc_config.type = |
JavaIceTransportsTypeToNativeType(jni, j_ice_transports_type); |
rtc_config.bundle_policy = JavaBundlePolicyToNativeType(jni, j_bundle_policy); |
@@ -1360,6 +1362,8 @@ JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)( |
GetIntField(jni, j_rtc_config, j_audio_jitter_buffer_max_packets_id); |
rtc_config.audio_jitter_buffer_fast_accelerate = GetBooleanField( |
jni, j_rtc_config, j_audio_jitter_buffer_fast_accelerate_id); |
+ rtc_config.ice_connection_receiving_timeout = |
+ GetIntField(jni, j_rtc_config, j_ice_connection_receiving_timeout_id); |
PCOJava* observer = reinterpret_cast<PCOJava*>(observer_p); |
observer->SetConstraints(new ConstraintsWrapper(jni, j_constraints)); |
@@ -1476,13 +1480,6 @@ JOW(void, PeerConnection_setRemoteDescription)( |
observer, JavaSdpToNativeSdp(jni, j_sdp)); |
} |
-JOW(void, PeerConnection_setIceConnectionReceivingTimeout)(JNIEnv* jni, |
- jobject j_pc, |
- jint timeout_ms) { |
- return ExtractNativePC(jni, j_pc) |
- ->SetIceConnectionReceivingTimeout(timeout_ms); |
-} |
- |
JOW(jboolean, PeerConnection_updateIce)( |
JNIEnv* jni, jobject j_pc, jobject j_ice_servers, jobject j_constraints) { |
PeerConnectionInterface::IceServers ice_servers; |