From a0d3067575bc3c4cbf7e56b9a7f998f79e14ae76 Mon Sep 17 00:00:00 2001 From: "mallinath@webrtc.org" Date: Sat, 26 Apr 2014 00:00:15 +0000 Subject: [PATCH] Use CreatePeerConnection method which accepts port_allocator. Other method will be removed, in a different CL. R=fischman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/20369006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5987 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/java/jni/peerconnection_jni.cc | 2 +- talk/app/webrtc/objc/RTCPeerConnectionFactory.mm | 1 + talk/examples/peerconnection/client/conductor.cc | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc index 11b89aaff..9739c8924 100644 --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc @@ -2065,7 +2065,7 @@ JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)( PCOJava* observer = reinterpret_cast(observer_p); observer->SetConstraints(new ConstraintsWrapper(jni, j_constraints)); talk_base::scoped_refptr pc(f->CreatePeerConnection( - servers, observer->constraints(), NULL, observer)); + servers, observer->constraints(), NULL, NULL, observer)); return (jlong)pc.release(); } diff --git a/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm b/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm index 81af8e11f..78db3cd17 100644 --- a/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm +++ b/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm @@ -100,6 +100,7 @@ talk_base::scoped_refptr peerConnection = self.nativeFactory->CreatePeerConnection(iceServers, constraints.constraints, + NULL, dummy_dtls_identity_service, observer); RTCPeerConnection* pc = diff --git a/talk/examples/peerconnection/client/conductor.cc b/talk/examples/peerconnection/client/conductor.cc index b35a05482..bbab3d06e 100644 --- a/talk/examples/peerconnection/client/conductor.cc +++ b/talk/examples/peerconnection/client/conductor.cc @@ -103,6 +103,7 @@ bool Conductor::InitializePeerConnection() { server.uri = GetPeerConnectionString(); servers.push_back(server); peer_connection_ = peer_connection_factory_->CreatePeerConnection(servers, + NULL, NULL, NULL, this);