Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / app / webrtc / peerconnection.h

diff --git a/src/third_party/libjingle/source/talk/app/webrtc/peerconnection.h b/src/third_party/libjingle/source/talk/app/webrtc/peerconnection.h
index cd5e2a9..4a428ef 100644 (file)
--- a/src/third_party/libjingle/source/talk/app/webrtc/peerconnection.h
+++ b/src/third_party/libjingle/source/talk/app/webrtc/peerconnection.h
@@ -57,11 +57,12 @@ class PeerConnection : public PeerConnectionInterface,
  public:
   explicit PeerConnection(PeerConnectionFactory* factory);
 
-  bool Initialize(const PeerConnectionInterface::IceServers& configuration,
-                  const MediaConstraintsInterface* constraints,
-                  PortAllocatorFactoryInterface* allocator_factory,
-                  DTLSIdentityServiceInterface* dtls_identity_service,
-                  PeerConnectionObserver* observer);
+  bool Initialize(
+      const PeerConnectionInterface::RTCConfiguration& configuration,
+      const MediaConstraintsInterface* constraints,
+      PortAllocatorFactoryInterface* allocator_factory,
+      DTLSIdentityServiceInterface* dtls_identity_service,
+      PeerConnectionObserver* observer);
   virtual talk_base::scoped_refptr<StreamCollectionInterface> local_streams();
   virtual talk_base::scoped_refptr<StreamCollectionInterface> remote_streams();
   virtual bool AddStream(MediaStreamInterface* local_stream,
@@ -97,10 +98,15 @@ class PeerConnection : public PeerConnectionInterface,
                                    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);
 
+  virtual void RegisterUMAObserver(UMAObserver* observer);
+
   virtual void Close();
 
  protected:
@@ -152,7 +158,8 @@ class PeerConnection : public PeerConnectionInterface,
                             cricket::BaseSession::State state);
   void ChangeSignalingState(SignalingState signaling_state);
 
-  bool DoInitialize(const StunConfigurations& stun_config,
+  bool DoInitialize(IceTransportsType type,
+                    const StunConfigurations& stun_config,
                     const TurnConfigurations& turn_config,
                     const MediaConstraintsInterface* constraints,
                     PortAllocatorFactoryInterface* allocator_factory,
@@ -178,6 +185,7 @@ class PeerConnection : public PeerConnectionInterface,
   // will refer to the same reference count.
   talk_base::scoped_refptr<PeerConnectionFactory> factory_;
   PeerConnectionObserver* observer_;
+  UMAObserver* uma_observer_;
   SignalingState signaling_state_;
   // TODO(bemasc): Remove ice_state_.
   IceState ice_state_;