Invoke OnPeerConnectionClosed when ICE connection state changes to closed. (#719)

* Invoke OnPeerConnectionClosed when ICE connection state changes to closed.

* Add iOS implementation.

Author: jianjunz

talk/owt/BUILD.gn

@@ -244,6 +244,11 @@ static_library("owt_sdk_base") {
 
   if (owt_ffmpeg_root != "") {
     include_dirs += [ owt_ffmpeg_root + "/include" ]
+    lib_dirs = [ owt_ffmpeg_root + "/lib" ]
+    libs = [
+      "avcodec",
+      "avutil",
+    ]
   }
 
   if (rtc_use_x11) {
@@ -302,7 +307,7 @@ static_library("owt_sdk_base") {
       "sdk/base/win/videorendererd3d11.cc",
       "sdk/base/win/videorendererd3d11.h",
     ]
-    if (owt_msdk_header_root != "" || owt_ffmpeg_root != ""||owt_cg_server) {
+    if (owt_msdk_header_root != "" || owt_ffmpeg_root != "" || owt_cg_server) {
       sources += [
         "sdk/base/win/externalvideodecoderfactory.cc",
         "sdk/base/win/externalvideodecoderfactory.h",

talk/owt/sdk/include/cpp/owt/p2p/p2pclient.h

@@ -260,6 +260,8 @@ class OWT_EXPORT P2PClient final
                                  const std::string& message);
   // Triggered when a new stream is added.
   virtual void OnStreamAdded(std::shared_ptr<owt::base::RemoteStream> stream);
+  // Triggered when the PeerConnection is closed.
+  virtual void OnPeerConnectionClosed(const std::string& remote_id);
 
  private:
   void Unpublish(const std::string& target_id,

talk/owt/sdk/p2p/objc/P2PPeerConnectionChannelObserverObjcImpl.h

@@ -22,6 +22,7 @@ class P2PPeerConnectionChannelObserverObjcImpl
   void OnStreamAdded(
       std::shared_ptr<owt::base::RemoteStream> stream) override;
   void OnStopped(const std::string& remote_id) override;
+  void OnPeerConnectionClosed(const std::string& remote_id) override;
   // Jianjun TODO: Remove OnStreamRemoved event
   void OnStreamRemoved(
       std::shared_ptr<owt::base::RemoteStream> stream);

talk/owt/sdk/p2p/objc/P2PPeerConnectionChannelObserverObjcImpl.mm

@@ -37,6 +37,12 @@
   [_observer onStoppedFrom:[NSString stringWithUTF8String:remote_id.c_str()]];
 }
 
+void P2PPeerConnectionChannelObserverObjcImpl::OnPeerConnectionClosed(
+    const std::string& remote_id) {
+  // This method is provided for CG server only. It doesn't have an iOS client,
+  // so we leave it empty here.
+}
+
 void P2PPeerConnectionChannelObserverObjcImpl::TriggerStreamRemoved(
     std::shared_ptr<owt::base::RemoteStream> stream) {
   if (remote_streams_.find(stream->Id()) == remote_streams_.end()) {

talk/owt/sdk/p2p/p2pclient.cc

@@ -453,10 +453,6 @@ void P2PClient::OnStopped(const std::string& remote_id) {
       pc_channels_.erase(remote_id);
     }
   }).detach();
-#ifdef OWT_CG_SERVER
-  EventTrigger::OnEvent1(observers_, event_queue_,
-                         &P2PClientObserver::OnPeerConnectionClosed, remote_id);
-#endif
 }
 void P2PClient::OnStreamAdded(std::shared_ptr<RemoteStream> stream) {
   EventTrigger::OnEvent1(
@@ -465,5 +461,13 @@ void P2PClient::OnStreamAdded(std::shared_ptr<RemoteStream> stream) {
           &P2PClientObserver::OnStreamAdded),
       stream);
 }
+
+void P2PClient::OnPeerConnectionClosed(const std::string& remote_id) {
+#ifdef OWT_CG_SERVER
+  EventTrigger::OnEvent1(observers_, event_queue_,
+                         &P2PClientObserver::OnPeerConnectionClosed, remote_id);
+#endif
+}
+
 }  // namespace p2p
 }  // namespace owt

talk/owt/sdk/p2p/p2ppeerconnectionchannel.cc

@@ -767,6 +767,7 @@ void P2PPeerConnectionChannel::OnIceConnectionChange(
       }).detach();
       break;
     case webrtc::PeerConnectionInterface::kIceConnectionClosed:
+      TriggerOnPeerConnectionClosed();
       TriggerOnStopped();
       CleanLastPeerConnection();
       break;
@@ -963,6 +964,14 @@ void P2PPeerConnectionChannel::TriggerOnStopped() {
   }
 }
 
+void P2PPeerConnectionChannel::TriggerOnPeerConnectionClosed() {
+  for (std::vector<P2PPeerConnectionChannelObserver*>::iterator it =
+           observers_.begin();
+       it != observers_.end(); it++) {
+    (*it)->OnPeerConnectionClosed(remote_id_);
+  }
+}
+
 void P2PPeerConnectionChannel::CleanLastPeerConnection() {
   pending_remote_sdp_.reset();
   negotiation_needed_ = false;

talk/owt/sdk/p2p/p2ppeerconnectionchannel.h

@@ -34,8 +34,10 @@ class P2PPeerConnectionChannelObserver {
   // Triggered when a new stream is added.
   virtual void OnStreamAdded(
       std::shared_ptr<RemoteStream> stream) = 0;
-  // Triggered when the WebRTC session is ended.
+  // Triggered when the PeerConnectionChannel is stopped.
   virtual void OnStopped(const std::string& remote_id) = 0;
+  // Triggered when the PeerConnection is closed.
+  virtual void OnPeerConnectionClosed(const std::string& remote_id) = 0;
 };
 // An instance of P2PPeerConnectionChannel manages a session for a specified
 // remote client.
@@ -148,6 +150,7 @@ class P2PPeerConnectionChannel : public P2PSignalingReceiverInterface,
   // Publish and/or unpublish all streams in pending stream list.
   void DrainPendingStreams();
   void TriggerOnStopped();
+  void TriggerOnPeerConnectionClosed();
   void CheckWaitedList();  // Check pending streams and negotiation requests.
   void SendStop(std::function<void()> on_success,
                 std::function<void(std::unique_ptr<Exception>)> on_failure);

talk/owt/sdk/p2p/p2ppeerconnectionchannelobservercppimpl.cc

@@ -17,5 +17,9 @@ void P2PPeerConnectionChannelObserverCppImpl::OnStopped(
     const std::string& remote_id) {
   peer_client_.OnStopped(remote_id);
 }
+void P2PPeerConnectionChannelObserverCppImpl::OnPeerConnectionClosed(
+    const std::string& remote_id) {
+  peer_client_.OnPeerConnectionClosed(remote_id);
+}
 }
 }

talk/owt/sdk/p2p/p2ppeerconnectionchannelobservercppimpl.h

@@ -20,12 +20,14 @@ class P2PPeerConnectionChannelObserverCppImpl
       : peer_client_(peer_client) {}
   // Triggered when remote user send data via data channel.
   // Currently, data is string type.
-  virtual void OnMessageReceived(const std::string& remote_id,
+  void OnMessageReceived(const std::string& remote_id,
                                  const std::string& message) override;
   // Triggered when a new stream is added.
-  virtual void OnStreamAdded(std::shared_ptr<RemoteStream> stream) override;
-  // Triggered when the WebRTC session is ended.
-  virtual void OnStopped(const std::string& remote_id) override;
+  void OnStreamAdded(std::shared_ptr<RemoteStream> stream) override;
+  // Triggered when the PeerConnectionChannel is stopped.
+  void OnStopped(const std::string& remote_id) override;
+  // Triggered when the PeerConnection is closed.
+  void OnPeerConnectionClosed(const std::string& remote_id) override;
 
  private:
   P2PClient& peer_client_;