zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove iceRegatherIntervalRange

Browse Source 
This was an ICE configuration experiment added a couple years ago that did not end up being used.

Bug: webrtc:11316
Change-Id: Iafb7e1c4f7b4598815f045808dbf6e470172f119
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/167680
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Qingsi Wang <qingsi@webrtc.org>
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30395}
This commit is contained in:
Steve Anton
2020-01-27 15:45:02 -08:00
committed by Commit Bot
parent ed9a401f27
commit f417238217
31 changed files with 34 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sdk/android/api/org/webrtc/PeerConnection.java
View File

@ -415,27 +415,6 @@ public class PeerConnection {
KEEP_FIRST_READY // Keep the first ready port and prune the rest on the same network.
}
/** Java version of rtc::IntervalRange */
public static class IntervalRange {
private final int min;
private final int max;
public IntervalRange(int min, int max) {
this.min = min;
this.max = max;
}
@CalledByNative("IntervalRange")
public int getMin() {
return min;
}
@CalledByNative("IntervalRange")
public int getMax() {
return max;
}
}
/**
* Java version of webrtc::SdpSemantics.
*
@ -525,7 +504,6 @@ public class PeerConnection {
//
// Can be set to Integer.MAX_VALUE to effectively disable the limit.
public int maxIPv6Networks;
@Nullable public IntervalRange iceRegatherIntervalRange;
// These values will be overridden by MediaStream constraints if deprecated constraints-based
// create peerconnection interface is used.
@ -609,7 +587,6 @@ public class PeerConnection {
stunCandidateKeepaliveIntervalMs = null;
disableIPv6OnWifi = false;
maxIPv6Networks = 5;
iceRegatherIntervalRange = null;
disableIpv6 = false;
enableDscp = false;
enableCpuOveruseDetection = true;
@ -765,12 +742,6 @@ public class PeerConnection {
return maxIPv6Networks;
}
@Nullable
@CalledByNative("RTCConfiguration")
IntervalRange getIceRegatherIntervalRange() {
return iceRegatherIntervalRange;
}
@Nullable
@CalledByNative("RTCConfiguration")
TurnCustomizer getTurnCustomizer() {

1
sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java
View File

@ -168,7 +168,6 @@ public class PeerConnectionTest {
// Test configuration options.
config.continualGatheringPolicy = PeerConnection.ContinualGatheringPolicy.GATHER_CONTINUALLY;
config.iceRegatherIntervalRange = new PeerConnection.IntervalRange(1000, 2000);
PeerConnection offeringPC =
factory.createPeerConnection(config, mock(PeerConnection.Observer.class));

7
sdk/android/src/jni/pc/peer_connection.cc
View File

@ -240,13 +240,6 @@ void JavaToNativeRTCConfiguration(
Java_RTCConfiguration_getDisableIPv6OnWifi(jni, j_rtc_config);
rtc_config->max_ipv6_networks =
Java_RTCConfiguration_getMaxIPv6Networks(jni, j_rtc_config);
ScopedJavaLocalRef<jobject> j_ice_regather_interval_range =
Java_RTCConfiguration_getIceRegatherIntervalRange(jni, j_rtc_config);
if (!IsNull(jni, j_ice_regather_interval_range)) {
int min = Java_IntervalRange_getMin(jni, j_ice_regather_interval_range);
int max = Java_IntervalRange_getMax(jni, j_ice_regather_interval_range);
rtc_config->ice_regather_interval_range.emplace(min, max);
}
rtc_config->turn_customizer = GetNativeTurnCustomizer(jni, j_turn_customizer);