Android: Deprecate peerconnection constraints.
C++ API allows passing all configuration through RTCConfiguration object. This adds all values previously passed through PC constraints to Java RTCConfiguration object and deprecates API that takes PC contraints. Using the deprecated API overrides the values in RTCConfigration object. Bug: webrtc:8663, webrtc:8662 Change-Id: I128432c3caba74403513fb1347ff58830c643885 Reviewed-on: https://webrtc-review.googlesource.com/33460 Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21357}
This commit is contained in:
committed by
Commit Bot
parent
ecb5e2a4b9
commit
e8b26cd86b
@ -357,6 +357,17 @@ public class PeerConnection {
|
||||
public int maxIPv6Networks;
|
||||
public IntervalRange iceRegatherIntervalRange;
|
||||
|
||||
// These values will be overridden by MediaStream constraints if deprecated constraints-based
|
||||
// create peerconnection interface is used.
|
||||
public boolean disableIpv6;
|
||||
public boolean enableDscp;
|
||||
public boolean enableCpuOveruseDetection;
|
||||
public boolean enableRtpDataChannel;
|
||||
public boolean suspendBelowMinBitrate;
|
||||
public Integer screencastMinBitrate;
|
||||
public Boolean combinedAudioVideoBwe;
|
||||
public Boolean enableDtlsSrtp;
|
||||
|
||||
// This is an optional wrapper for the C++ webrtc::TurnCustomizer.
|
||||
public TurnCustomizer turnCustomizer;
|
||||
|
||||
@ -383,6 +394,14 @@ public class PeerConnection {
|
||||
disableIPv6OnWifi = false;
|
||||
maxIPv6Networks = 5;
|
||||
iceRegatherIntervalRange = null;
|
||||
disableIpv6 = false;
|
||||
enableDscp = false;
|
||||
enableCpuOveruseDetection = true;
|
||||
enableRtpDataChannel = false;
|
||||
suspendBelowMinBitrate = false;
|
||||
screencastMinBitrate = null;
|
||||
combinedAudioVideoBwe = null;
|
||||
enableDtlsSrtp = null;
|
||||
}
|
||||
|
||||
@CalledByNative("RTCConfiguration")
|
||||
@ -484,6 +503,46 @@ public class PeerConnection {
|
||||
TurnCustomizer getTurnCustomizer() {
|
||||
return turnCustomizer;
|
||||
}
|
||||
|
||||
@CalledByNative("RTCConfiguration")
|
||||
boolean getDisableIpv6() {
|
||||
return disableIpv6;
|
||||
}
|
||||
|
||||
@CalledByNative("RTCConfiguration")
|
||||
boolean getEnableDscp() {
|
||||
return enableDscp;
|
||||
}
|
||||
|
||||
@CalledByNative("RTCConfiguration")
|
||||
boolean getEnableCpuOveruseDetection() {
|
||||
return enableCpuOveruseDetection;
|
||||
}
|
||||
|
||||
@CalledByNative("RTCConfiguration")
|
||||
boolean getEnableRtpDataChannel() {
|
||||
return enableRtpDataChannel;
|
||||
}
|
||||
|
||||
@CalledByNative("RTCConfiguration")
|
||||
boolean getSuspendBelowMinBitrate() {
|
||||
return suspendBelowMinBitrate;
|
||||
}
|
||||
|
||||
@CalledByNative("RTCConfiguration")
|
||||
Integer getScreencastMinBitrate() {
|
||||
return screencastMinBitrate;
|
||||
}
|
||||
|
||||
@CalledByNative("RTCConfiguration")
|
||||
Boolean getCombinedAudioVideoBwe() {
|
||||
return combinedAudioVideoBwe;
|
||||
}
|
||||
|
||||
@CalledByNative("RTCConfiguration")
|
||||
Boolean getEnableDtlsSrtp() {
|
||||
return enableDtlsSrtp;
|
||||
}
|
||||
};
|
||||
|
||||
private final List<MediaStream> localStreams = new ArrayList<>();
|
||||
|
||||
Reference in New Issue
Block a user