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

Set the IceConnectionReceivingTimeout as a RTCConfiguration parameter.

Browse Source 
BUG= 4901

Review URL: https://codereview.webrtc.org/1315503003

Cr-Commit-Position: refs/heads/master@{#9832}
This commit is contained in:
honghaiz
2015-09-01 09:53:56 -07:00
committed by Commit bot
parent 0f9af01456
commit 4edc39c569
9 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
talk/app/webrtc/java/jni/peerconnection_jni.cc
View File

@ -1349,13 +1349,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);
@ -1368,6 +1370,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));
@ -1484,13 +1488,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;

4
talk/app/webrtc/java/src/org/webrtc/PeerConnection.java
View File

@ -138,6 +138,7 @@ public class PeerConnection {
public TcpCandidatePolicy tcpCandidatePolicy;
public int audioJitterBufferMaxPackets;
public boolean audioJitterBufferFastAccelerate;
public int iceConnectionReceivingTimeout;
public RTCConfiguration(List<IceServer> iceServers) {
iceTransportsType = IceTransportsType.ALL;
@ -147,6 +148,7 @@ public class PeerConnection {
this.iceServers = iceServers;
audioJitterBufferMaxPackets = 50;
audioJitterBufferFastAccelerate = false;
iceConnectionReceivingTimeout = -1;
}
};
@ -180,8 +182,6 @@ public class PeerConnection {
public native void setRemoteDescription(
SdpObserver observer, SessionDescription sdp);
public native void setIceConnectionReceivingTimeout(int timeoutMs);
public native boolean updateIce(
List<IceServer> iceServers, MediaConstraints constraints);

8
talk/app/webrtc/objc/RTCPeerConnectionInterface.mm
View File

@ -38,6 +38,7 @@
@synthesize rtcpMuxPolicy = _rtcpMuxPolicy;
@synthesize tcpCandidatePolicy = _tcpCandidatePolicy;
@synthesize audioJitterBufferMaxPackets = _audioJitterBufferMaxPackets;
@synthesize iceConnectionReceivingTimeout = _iceConnectionReceivingTimeout;
- (instancetype)init {
if (self = [super init]) {
@ -49,6 +50,7 @@
_tcpCandidatePolicy =
[RTCEnumConverter tcpCandidatePolicyForNativeEnum:config.tcp_candidate_policy];
_audioJitterBufferMaxPackets = config.audio_jitter_buffer_max_packets;
_iceConnectionReceivingTimeout = config.ice_connection_receiving_timeout;
}
return self;
}
@ -57,13 +59,15 @@
bundlePolicy:(RTCBundlePolicy)bundlePolicy
rtcpMuxPolicy:(RTCRtcpMuxPolicy)rtcpMuxPolicy
tcpCandidatePolicy:(RTCTcpCandidatePolicy)tcpCandidatePolicy
audioJitterBufferMaxPackets:(int)audioJitterBufferMaxPackets {
audioJitterBufferMaxPackets:(int)audioJitterBufferMaxPackets
iceConnectionReceivingTimeout:(int)iceConnectionReceivingTimeout {
if (self = [super init]) {
_iceTransportsType = iceTransportsType;
_bundlePolicy = bundlePolicy;
_rtcpMuxPolicy = rtcpMuxPolicy;
_tcpCandidatePolicy = tcpCandidatePolicy;
_audioJitterBufferMaxPackets = audioJitterBufferMaxPackets;
_iceConnectionReceivingTimeout = iceConnectionReceivingTimeout;
}
return self;
}
@ -81,6 +85,8 @@
nativeConfig.tcp_candidate_policy =
[RTCEnumConverter nativeEnumForTcpCandidatePolicy:_tcpCandidatePolicy];
nativeConfig.audio_jitter_buffer_max_packets = _audioJitterBufferMaxPackets;
nativeConfig.ice_connection_receiving_timeout =
_iceConnectionReceivingTimeout;
return nativeConfig;
}

4
talk/app/webrtc/objc/public/RTCPeerConnectionInterface.h
View File

@ -63,11 +63,13 @@ typedef NS_ENUM(NSInteger, RTCTcpCandidatePolicy) {
@property(nonatomic, assign) RTCRtcpMuxPolicy rtcpMuxPolicy;
@property(nonatomic, assign) RTCTcpCandidatePolicy tcpCandidatePolicy;
@property(nonatomic, assign) int audioJitterBufferMaxPackets;
@property(nonatomic, assign) int iceConnectionReceivingTimeout;
- (instancetype)initWithIceTransportsType:(RTCIceTransportsType)iceTransportsType
bundlePolicy:(RTCBundlePolicy)bundlePolicy
rtcpMuxPolicy:(RTCRtcpMuxPolicy)rtcpMuxPolicy
tcpCandidatePolicy:(RTCTcpCandidatePolicy)tcpCandidatePolicy
audioJitterBufferMaxPackets:(int)audioJitterBufferMaxPackets;
audioJitterBufferMaxPackets:(int)audioJitterBufferMaxPackets
iceConnectionReceivingTimeout:(int)iceConnectionReceivingTimeout;
@end

6
talk/app/webrtc/peerconnection.cc
View File

@ -649,10 +649,6 @@ void PeerConnection::PostSetSessionDescriptionFailure(
signaling_thread()->Post(this, MSG_SET_SESSIONDESCRIPTION_FAILED, msg);
}
void PeerConnection::SetIceConnectionReceivingTimeout(int timeout_ms) {
session_->SetIceConnectionReceivingTimeout(timeout_ms);
}
bool PeerConnection::UpdateIce(const IceServers& configuration,
const MediaConstraintsInterface* constraints) {
return false;
@ -696,6 +692,8 @@ bool PeerConnection::UpdateIce(const RTCConfiguration& config) {
}
}
}
session_->SetIceConnectionReceivingTimeout(
config.ice_connection_receiving_timeout);
return session_->SetIceTransports(config.type);
}

1
talk/app/webrtc/peerconnection.h
View File

@ -100,7 +100,6 @@ class PeerConnection : public PeerConnectionInterface,
SessionDescriptionInterface* desc);
virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer,
SessionDescriptionInterface* desc);
virtual void SetIceConnectionReceivingTimeout(int timeout_ms);
// TODO(mallinath) : Deprecated version, remove after all clients are updated.
virtual bool UpdateIce(const IceServers& configuration,
const MediaConstraintsInterface* constraints);

11
talk/app/webrtc/peerconnectioninterface.h
View File

@ -233,6 +233,9 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
// TODO(hbos): Change into class with private data and public getters.
struct RTCConfiguration {
static const int kUndefined = -1;
// Default maximum number of packets in the audio jitter buffer.
static const int kAudioJitterBufferMaxPackets = 50;
// TODO(pthatcher): Rename this ice_transport_type, but update
// Chromium at the same time.
IceTransportsType type;
@ -247,6 +250,7 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
TcpCandidatePolicy tcp_candidate_policy;
int audio_jitter_buffer_max_packets;
bool audio_jitter_buffer_fast_accelerate;
int ice_connection_receiving_timeout;
std::vector<rtc::scoped_refptr<rtc::RTCCertificate>> certificates;
RTCConfiguration()
@ -255,8 +259,9 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
bundle_policy(kBundlePolicyBalanced),
rtcp_mux_policy(kRtcpMuxPolicyNegotiate),
tcp_candidate_policy(kTcpCandidatePolicyEnabled),
audio_jitter_buffer_max_packets(50),
audio_jitter_buffer_fast_accelerate(false) {}
audio_jitter_buffer_max_packets(kAudioJitterBufferMaxPackets),
audio_jitter_buffer_fast_accelerate(false),
ice_connection_receiving_timeout(kUndefined) {}
};
struct RTCOfferAnswerOptions {
@ -358,8 +363,6 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
// The |observer| callback will be called when done.
virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer,
SessionDescriptionInterface* desc) = 0;
// Sets the ICE connection receiving timeout value in milliseconds.
virtual void SetIceConnectionReceivingTimeout(int timeout_ms) {}
// Restarts or updates the ICE Agent process of gathering local candidates
// and pinging remote candidates.
virtual bool UpdateIce(const IceServers& configuration,

1
talk/app/webrtc/peerconnectionproxy.h
View File

@ -62,7 +62,6 @@ BEGIN_PROXY_MAP(PeerConnection)
const MediaConstraintsInterface*)
PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*)
PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*)
PROXY_METHOD1(void, SetIceConnectionReceivingTimeout, int)
PROXY_METHOD0(SignalingState, signaling_state)
PROXY_METHOD0(IceState, ice_state)
PROXY_METHOD0(IceConnectionState, ice_connection_state)

3
talk/app/webrtc/webrtcsession.cc
View File

@ -584,6 +584,9 @@ bool WebRtcSession::Initialize(
certificate = rtc_configuration.certificates[0];
}
SetIceConnectionReceivingTimeout(
rtc_configuration.ice_connection_receiving_timeout);
// TODO(perkj): Take |constraints| into consideration. Return false if not all
// mandatory constraints can be fulfilled. Note that |constraints|
// can be null.