Revert of Adding PeerConnectionInterface::SetConfiguration method. (patchset #4 id:60001 of https://codereview.webrtc.org/1317353005/ ) Reason for revert: Broke FYI bots because SetConfiguration is pure virtual and MockPeerConnectionImpl doesn't implement it. Need to reland with SetConfiguration not pure virtual. Original issue's description: > Adding PeerConnectionInterface::SetConfiguration method. > > Also updated the JNI and Objective-C bindings. Later, will have a CL to > remove UpdateIce, which this method effectively replaces. > > BUG=webrtc:4945 > > Committed: https://crrev.com/70702afbcb8418fe93747e7ed63bcbf5e56b90e9 > Cr-Commit-Position: refs/heads/master@{#10040} TBR=guoweis@webrtc.org,pthatcher@webrtc.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4945 Review URL: https://codereview.webrtc.org/1361263002 Cr-Commit-Position: refs/heads/master@{#10041}
diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc index 58ca6d9..8e274a4 100644 --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc
@@ -1360,10 +1360,13 @@ CHECK_EXCEPTION(jni) << "error during CallBooleanMethod"; } -static void JavaRTCConfigurationToJsepRTCConfiguration( - JNIEnv* jni, - jobject j_rtc_config, - PeerConnectionInterface::RTCConfiguration* rtc_config) { +JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)( + JNIEnv *jni, jclass, jlong factory, jobject j_rtc_config, + jobject j_constraints, jlong observer_p) { + rtc::scoped_refptr<PeerConnectionFactoryInterface> f( + reinterpret_cast<PeerConnectionFactoryInterface*>( + factoryFromJava(factory))); + jclass j_rtc_config_class = GetObjectClass(jni, j_rtc_config); jfieldID j_ice_transports_type_id = GetFieldID( @@ -1402,37 +1405,25 @@ jfieldID j_ice_connection_receiving_timeout_id = GetFieldID(jni, j_rtc_config_class, "iceConnectionReceivingTimeout", "I"); - rtc_config->type = - JavaIceTransportsTypeToNativeType(jni, j_ice_transports_type); - rtc_config->bundle_policy = - JavaBundlePolicyToNativeType(jni, j_bundle_policy); - rtc_config->rtcp_mux_policy = - JavaRtcpMuxPolicyToNativeType(jni, j_rtcp_mux_policy); - rtc_config->tcp_candidate_policy = - JavaTcpCandidatePolicyToNativeType(jni, j_tcp_candidate_policy); - JavaIceServersToJsepIceServers(jni, j_ice_servers, &rtc_config->servers); - rtc_config->audio_jitter_buffer_max_packets = - 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); -} - -JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)( - JNIEnv *jni, jclass, jlong factory, jobject j_rtc_config, - jobject j_constraints, jlong observer_p) { - rtc::scoped_refptr<PeerConnectionFactoryInterface> f( - reinterpret_cast<PeerConnectionFactoryInterface*>( - factoryFromJava(factory))); + jfieldID j_key_type_id = GetFieldID(jni, j_rtc_config_class, "keyType", + "Lorg/webrtc/PeerConnection$KeyType;"); + jobject j_key_type = GetObjectField(jni, j_rtc_config, j_key_type_id); PeerConnectionInterface::RTCConfiguration rtc_config; - JavaRTCConfigurationToJsepRTCConfiguration(jni, j_rtc_config, &rtc_config); - - jclass j_rtc_config_class = GetObjectClass(jni, j_rtc_config); - jfieldID j_key_type_id = GetFieldID(jni, j_rtc_config_class, "keyType", - "Lorg/webrtc/PeerConnection$KeyType;"); - jobject j_key_type = GetObjectField(jni, j_rtc_config, j_key_type_id); + rtc_config.type = + JavaIceTransportsTypeToNativeType(jni, j_ice_transports_type); + rtc_config.bundle_policy = JavaBundlePolicyToNativeType(jni, j_bundle_policy); + rtc_config.rtcp_mux_policy = + JavaRtcpMuxPolicyToNativeType(jni, j_rtcp_mux_policy); + rtc_config.tcp_candidate_policy = + JavaTcpCandidatePolicyToNativeType(jni, j_tcp_candidate_policy); + JavaIceServersToJsepIceServers(jni, j_ice_servers, &rtc_config.servers); + rtc_config.audio_jitter_buffer_max_packets = + 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); // Create ECDSA certificate. if (JavaKeyTypeToNativeType(jni, j_key_type) == rtc::KT_ECDSA) { @@ -1565,11 +1556,13 @@ observer, JavaSdpToNativeSdp(jni, j_sdp)); } -JOW(jboolean, PeerConnection_setConfiguration)( - JNIEnv* jni, jobject j_pc, jobject j_rtc_config) { - PeerConnectionInterface::RTCConfiguration rtc_config; - JavaRTCConfigurationToJsepRTCConfiguration(jni, j_rtc_config, &rtc_config); - return ExtractNativePC(jni, j_pc)->SetConfiguration(rtc_config); +JOW(jboolean, PeerConnection_updateIce)( + JNIEnv* jni, jobject j_pc, jobject j_ice_servers, jobject j_constraints) { + PeerConnectionInterface::IceServers ice_servers; + JavaIceServersToJsepIceServers(jni, j_ice_servers, &ice_servers); + scoped_ptr<ConstraintsWrapper> constraints( + new ConstraintsWrapper(jni, j_constraints)); + return ExtractNativePC(jni, j_pc)->UpdateIce(ice_servers, constraints.get()); } JOW(jboolean, PeerConnection_nativeAddIceCandidate)(
diff --git a/talk/app/webrtc/java/src/org/webrtc/PeerConnection.java b/talk/app/webrtc/java/src/org/webrtc/PeerConnection.java index 26f6b56..8730af9 100644 --- a/talk/app/webrtc/java/src/org/webrtc/PeerConnection.java +++ b/talk/app/webrtc/java/src/org/webrtc/PeerConnection.java
@@ -190,7 +190,8 @@ public native void setRemoteDescription( SdpObserver observer, SessionDescription sdp); - public native boolean setConfiguration(RTCConfiguration config); + public native boolean updateIce( + List<IceServer> iceServers, MediaConstraints constraints); public boolean addIceCandidate(IceCandidate candidate) { return nativeAddIceCandidate(
diff --git a/talk/app/webrtc/objc/RTCPeerConnection.mm b/talk/app/webrtc/objc/RTCPeerConnection.mm index 44d39cb..0d30acc 100644 --- a/talk/app/webrtc/objc/RTCPeerConnection.mm +++ b/talk/app/webrtc/objc/RTCPeerConnection.mm
@@ -208,9 +208,13 @@ self.peerConnection->SetRemoteDescription(observer, sdp.sessionDescription); } -- (BOOL)setConfiguration:(RTCConfiguration *)configuration { - return self.peerConnection->SetConfiguration( - configuration.nativeConfiguration); +- (BOOL)updateICEServers:(NSArray*)servers + constraints:(RTCMediaConstraints*)constraints { + webrtc::PeerConnectionInterface::IceServers iceServers; + for (RTCICEServer* server in servers) { + iceServers.push_back(server.iceServer); + } + return self.peerConnection->UpdateIce(iceServers, constraints.constraints); } - (RTCSessionDescription*)localDescription {
diff --git a/talk/app/webrtc/objc/public/RTCPeerConnection.h b/talk/app/webrtc/objc/public/RTCPeerConnection.h index a13ed3e..7177fd6 100644 --- a/talk/app/webrtc/objc/public/RTCPeerConnection.h +++ b/talk/app/webrtc/objc/public/RTCPeerConnection.h
@@ -27,7 +27,6 @@ #import "RTCPeerConnectionDelegate.h" -@class RTCConfiguration; @class RTCDataChannel; @class RTCDataChannelInit; @class RTCICECandidate; @@ -98,12 +97,10 @@ setRemoteDescriptionWithDelegate:(id<RTCSessionDescriptionDelegate>)delegate sessionDescription:(RTCSessionDescription *)sdp; -// Sets the PeerConnection's global configuration to |configuration|. -// Any changes to STUN/TURN servers or ICE candidate policy will affect the -// next gathering phase, and cause the next call to createOffer to generate -// new ICE credentials. Note that the BUNDLE and RTCP-multiplexing policies -// cannot be changed with this method. -- (BOOL)setConfiguration:(RTCConfiguration *)configuration; +// Restarts or updates the ICE Agent process of gathering local candidates +// and pinging remote candidates. +- (BOOL)updateICEServers:(NSArray *)servers + constraints:(RTCMediaConstraints *)constraints; // Provides a remote candidate to the ICE Agent. - (BOOL)addICECandidate:(RTCICECandidate *)candidate;
diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc index 71ab461..1215655 100644 --- a/talk/app/webrtc/peerconnection.cc +++ b/talk/app/webrtc/peerconnection.cc
@@ -658,7 +658,7 @@ return false; } -bool PeerConnection::SetConfiguration(const RTCConfiguration& config) { +bool PeerConnection::UpdateIce(const RTCConfiguration& config) { if (port_allocator_) { std::vector<PortAllocatorFactoryInterface::StunConfiguration> stuns; std::vector<PortAllocatorFactoryInterface::TurnConfiguration> turns; @@ -675,8 +675,7 @@ rtc::SocketAddress stun_addr; if (!stun_hosts.empty()) { stun_addr = stun_hosts.front(); - LOG(LS_INFO) << "SetConfiguration: StunServer Address: " - << stun_addr.ToString(); + LOG(LS_INFO) << "UpdateIce: StunServer Address: " << stun_addr.ToString(); } for (size_t i = 0; i < turns.size(); ++i) { @@ -688,7 +687,7 @@ relay_server.ports.push_back(cricket::ProtocolAddress( turns[i].server, protocol, turns[i].secure)); relay_server.credentials = credentials; - LOG(LS_INFO) << "SetConfiguration: TurnServer Address: " + LOG(LS_INFO) << "UpdateIce: TurnServer Address: " << turns[i].server.ToString(); } else { LOG(LS_WARNING) << "Ignoring TURN server " << turns[i].server << ". "
diff --git a/talk/app/webrtc/peerconnection.h b/talk/app/webrtc/peerconnection.h index c9c524b..2160afb 100644 --- a/talk/app/webrtc/peerconnection.h +++ b/talk/app/webrtc/peerconnection.h
@@ -64,59 +64,59 @@ PortAllocatorFactoryInterface* allocator_factory, rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, PeerConnectionObserver* observer); - rtc::scoped_refptr<StreamCollectionInterface> local_streams() override; - rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override; - bool AddStream(MediaStreamInterface* local_stream) override; - void RemoveStream(MediaStreamInterface* local_stream) override; + virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams(); + virtual rtc::scoped_refptr<StreamCollectionInterface> remote_streams(); + virtual bool AddStream(MediaStreamInterface* local_stream); + virtual void RemoveStream(MediaStreamInterface* local_stream); - rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( - AudioTrackInterface* track) override; + virtual rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( + AudioTrackInterface* track); - rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( + virtual rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( const std::string& label, - const DataChannelInit* config) override; - bool GetStats(StatsObserver* observer, - webrtc::MediaStreamTrackInterface* track, - StatsOutputLevel level) override; + const DataChannelInit* config); + virtual bool GetStats(StatsObserver* observer, + webrtc::MediaStreamTrackInterface* track, + StatsOutputLevel level); - SignalingState signaling_state() override; + virtual SignalingState signaling_state(); // TODO(bemasc): Remove ice_state() when callers are removed. - IceState ice_state() override; - IceConnectionState ice_connection_state() override; - IceGatheringState ice_gathering_state() override; + virtual IceState ice_state(); + virtual IceConnectionState ice_connection_state(); + virtual IceGatheringState ice_gathering_state(); - const SessionDescriptionInterface* local_description() const override; - const SessionDescriptionInterface* remote_description() const override; + virtual const SessionDescriptionInterface* local_description() const; + virtual const SessionDescriptionInterface* remote_description() const; // JSEP01 - void CreateOffer(CreateSessionDescriptionObserver* observer, - const MediaConstraintsInterface* constraints) override; - void CreateOffer(CreateSessionDescriptionObserver* observer, - const RTCOfferAnswerOptions& options) override; - void CreateAnswer(CreateSessionDescriptionObserver* observer, - const MediaConstraintsInterface* constraints) override; - void SetLocalDescription(SetSessionDescriptionObserver* observer, - SessionDescriptionInterface* desc) override; - void SetRemoteDescription(SetSessionDescriptionObserver* observer, - SessionDescriptionInterface* desc) override; - // TODO(deadbeef) : Deprecated version, remove after all clients are updated. - bool UpdateIce(const IceServers& configuration, - const MediaConstraintsInterface* constraints) override; - bool SetConfiguration( - const PeerConnectionInterface::RTCConfiguration& config) override; - bool AddIceCandidate(const IceCandidateInterface* candidate) override; + virtual void CreateOffer(CreateSessionDescriptionObserver* observer, + const MediaConstraintsInterface* constraints); + virtual void CreateOffer(CreateSessionDescriptionObserver* observer, + const RTCOfferAnswerOptions& options); + virtual void CreateAnswer(CreateSessionDescriptionObserver* observer, + const MediaConstraintsInterface* constraints); + virtual void SetLocalDescription(SetSessionDescriptionObserver* observer, + SessionDescriptionInterface* desc); + virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer, + SessionDescriptionInterface* desc); + // TODO(mallinath) : Deprecated version, remove after all clients are updated. + virtual bool UpdateIce(const IceServers& configuration, + const MediaConstraintsInterface* constraints); + virtual bool UpdateIce( + const PeerConnectionInterface::RTCConfiguration& config); + virtual bool AddIceCandidate(const IceCandidateInterface* candidate); - void RegisterUMAObserver(UMAObserver* observer) override; + virtual void RegisterUMAObserver(UMAObserver* observer); - void Close() override; + virtual void Close(); protected: - ~PeerConnection() override; + virtual ~PeerConnection(); private: // Implements MessageHandler. - void OnMessage(rtc::Message* msg) override; + virtual void OnMessage(rtc::Message* msg); // Implements MediaStreamSignalingObserver. void OnAddRemoteStream(MediaStreamInterface* stream) override;
diff --git a/talk/app/webrtc/peerconnectioninterface.h b/talk/app/webrtc/peerconnectioninterface.h index f56238f..ca85338 100644 --- a/talk/app/webrtc/peerconnectioninterface.h +++ b/talk/app/webrtc/peerconnectioninterface.h
@@ -359,16 +359,8 @@ SessionDescriptionInterface* desc) = 0; // Restarts or updates the ICE Agent process of gathering local candidates // and pinging remote candidates. - // TODO(deadbeef): Remove once Chrome is moved over to SetConfiguration. virtual bool UpdateIce(const IceServers& configuration, const MediaConstraintsInterface* constraints) = 0; - // Sets the PeerConnection's global configuration to |config|. - // Any changes to STUN/TURN servers or ICE candidate policy will affect the - // next gathering phase, and cause the next call to createOffer to generate - // new ICE credentials. Note that the BUNDLE and RTCP-multiplexing policies - // cannot be changed with this method. - virtual bool SetConfiguration( - const PeerConnectionInterface::RTCConfiguration& config) = 0; // Provides a remote candidate to the ICE Agent. // A copy of the |candidate| will be created and added to the remote // description. So the caller of this method still has the ownership of the
diff --git a/talk/app/webrtc/peerconnectionproxy.h b/talk/app/webrtc/peerconnectionproxy.h index 01a9daa..2f015cdf 100644 --- a/talk/app/webrtc/peerconnectionproxy.h +++ b/talk/app/webrtc/peerconnectionproxy.h
@@ -60,9 +60,6 @@ SessionDescriptionInterface*) PROXY_METHOD2(bool, UpdateIce, const IceServers&, const MediaConstraintsInterface*) - PROXY_METHOD1(bool, - SetConfiguration, - const PeerConnectionInterface::RTCConfiguration&); PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*) PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*) PROXY_METHOD0(SignalingState, signaling_state)