| Index: talk/app/webrtc/peerconnection.h
|
| diff --git a/talk/app/webrtc/peerconnection.h b/talk/app/webrtc/peerconnection.h
|
| index df4cb78fc1de5c0281d66e02f70ad28bff8b505d..c9af07d454dcde69705162c66e08dca4d738e1ee 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,16 @@ class PeerConnection : public PeerConnectionInterface,
|
| virtual ~PeerConnection();
|
|
|
| private:
|
| + // Initialize helper function. Initializes everything necessary by the peer
|
| + // connection except |session_|. The |session_| is created and ice observer
|
| + // and OnSessionStateChange registered, but the |session_|->Initialize call
|
| + // necessary and sufficient to complete initialization is not performed here.
|
| + bool InitializeInternal(
|
| + const PeerConnectionInterface::RTCConfiguration& configuration,
|
| + const MediaConstraintsInterface* constraints,
|
| + PortAllocatorFactoryInterface* allocator_factory,
|
| + PeerConnectionObserver* observer);
|
| +
|
| // Implements MessageHandler.
|
| virtual void OnMessage(rtc::Message* msg);
|
|
|
|
|