Index: talk/app/webrtc/peerconnection.h |
diff --git a/talk/app/webrtc/peerconnection.h b/talk/app/webrtc/peerconnection.h |
index df4cb78fc1de5c0281d66e02f70ad28bff8b505d..34d6756daa4e849abbe10e335afeb0538b469a0b 100644 |
--- a/talk/app/webrtc/peerconnection.h |
+++ b/talk/app/webrtc/peerconnection.h |
@@ -58,12 +58,19 @@ class PeerConnection : public PeerConnectionInterface, |
public: |
explicit PeerConnection(PeerConnectionFactory* factory); |
+ // This method takes the ownership of |dtls_identity_service|. |
bool Initialize( |
- const PeerConnectionInterface::RTCConfiguration& configuration, |
- const MediaConstraintsInterface* constraints, |
- PortAllocatorFactoryInterface* allocator_factory, |
- rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, |
- PeerConnectionObserver* observer); |
+ const PeerConnectionInterface::RTCConfiguration& configuration, |
+ const MediaConstraintsInterface* constraints, |
+ PortAllocatorFactoryInterface* allocator_factory, |
+ rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, |
+ PeerConnectionObserver* observer); |
+ bool Initialize( |
+ const PeerConnectionInterface::RTCConfiguration& configuration, |
+ const MediaConstraintsInterface* constraints, |
+ PortAllocatorFactoryInterface* allocator_factory, |
+ const rtc::scoped_refptr<DtlsCertificate>& certificate, |
+ PeerConnectionObserver* observer); |
virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams(); |
virtual rtc::scoped_refptr<StreamCollectionInterface> remote_streams(); |
virtual bool AddStream(MediaStreamInterface* local_stream); |
@@ -116,6 +123,13 @@ class PeerConnection : public PeerConnectionInterface, |
virtual ~PeerConnection(); |
private: |
+ bool InitializeCommon( |
Henrik Grunell WebRTC
2015/08/12 14:46:29
I think these two can have clearer names. Try desc
hbos
2015/08/14 14:09:38
Done. I merged the second helper function into the
|
+ const PeerConnectionInterface::RTCConfiguration& configuration, |
+ const MediaConstraintsInterface* constraints, |
+ PortAllocatorFactoryInterface* allocator_factory, |
+ PeerConnectionObserver* observer); |
+ void InitializeSessionAfterInit(); |
+ |
// Implements MessageHandler. |
virtual void OnMessage(rtc::Message* msg); |