Add a new event OnPeerConnectionClosed for P2PClientObserver. (#655)

Author: jianjunz

build_overrides/build.gni

@@ -68,4 +68,7 @@ declare_args() {
 
   # Enable HEVC for WebRTC.
   rtc_use_h265 = false
+
+  # Build OWT for cloud gaming. It enables low latency features, and disables audio processing. It may break normal WebRTC features, is not intended for general use.
+  owt_cloud_gaming = false
 }

talk/owt/BUILD.gn

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import("//build/config/sysroot.gni")
+import("//build_overrides/build.gni")
 import("//testing/test.gni")
 import("//third_party/webrtc/webrtc.gni")
 
@@ -223,6 +224,7 @@ static_library("owt_sdk_base") {
   if (rtc_use_h265) {
     defines += [ "WEBRTC_USE_H265" ]
   }
+
   if (is_win || is_linux) {
     # Custom audio/video input and output.
     # When rebasing libwebrtc to a new version, custom audio/video input/output
@@ -385,6 +387,9 @@ static_library("owt_sdk_p2p") {
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
   configs += [ ":owt_symbols" ]
+  if (owt_cloud_gaming) {
+    defines = [ "OWT_CLOUD_GAMING" ]
+  }
 }
 static_library("owt_sdk_conf") {
   deps = [

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

@@ -63,6 +63,15 @@ class OWT_EXPORT P2PClientObserver {
    signaling server.
    */
   virtual void OnServerDisconnected(){}
+
+#ifdef OWT_CLOUD_GAMING
+  /**
+   @brief This function will be invoked when a PeerConnection with remote
+   endpoint is closed. SDK will create a new PeerConnection if publish or send
+   is called by either side.
+   */
+  virtual void OnPeerConnectionClosed(const std::string& remote_user_id) {}
+#endif
 };
 /// An async client for P2P WebRTC sessions
 class OWT_EXPORT P2PClient final

talk/owt/sdk/p2p/p2pclient.cc

@@ -443,8 +443,11 @@ void P2PClient::OnStopped(const std::string& remote_id) {
       const std::lock_guard<std::mutex> lock(pc_channels_mutex_);
       pc_channels_.erase(remote_id);
     }
-  })
-      .detach();
+  }).detach();
+#ifdef OWT_CLOUD_GAMING
+  EventTrigger::OnEvent1(observers_, event_queue_,
+                         &P2PClientObserver::OnPeerConnectionClosed, remote_id);
+#endif
 }
 void P2PClient::OnStreamAdded(std::shared_ptr<RemoteStream> stream) {
   EventTrigger::OnEvent1(

talk/owt/sdk/p2p/tests/BUILD.gn

@@ -1,4 +1,5 @@
 import("//third_party/webrtc/webrtc.gni")
+import("//build_overrides/build.gni")
 
 rtc_test("p2p_e2e_test") {
   testonly = true
@@ -18,4 +19,7 @@ rtc_test("p2p_e2e_test") {
   if (is_win) {
     libs = [ "dcomp.lib" ]
   }
+  if(owt_cloud_gaming){
+    defines = [ "OWT_CLOUD_GAMING" ]
+  }
 }

talk/owt/sdk/p2p/tests/e2e_tests.cc

@@ -27,6 +27,9 @@ class P2PClientMockObserver : public owt::p2p::P2PClientObserver {
   MOCK_METHOD2(OnMessageReceived, void(const std::string&, const std::string));
   MOCK_METHOD1(OnStreamAdded,
                void(std::shared_ptr<owt::base::RemoteStream> stream));
+#ifdef OWT_CLOUD_GAMING
+  MOCK_METHOD1(OnPeerConnectionClosed, void(const std::string&));
+#endif
 };
 
 // A sink dumps video frames in a given interval.
@@ -141,14 +144,14 @@ class EndToEndTest : public ::testing::Test {
   webrtc::test::RunLoop loop_;
 };
 
-// TEST_F(EndToEndTest, SendMessgeCanBeReceived) {
-//   task_queue_->PostTask([this] {
-//     client1_->Send("client2", "message", nullptr, nullptr);
-//     EXPECT_CALL(observer2_, OnMessageReceived("client1", testing::_))
-//         .WillOnce(testing::InvokeWithoutArgs([this] { loop_.Quit(); }));
-//   });
-//   loop_.Run();
-// }
+TEST_F(EndToEndTest, SendMessgeCanBeReceived) {
+  task_queue_->PostTask([this] {
+    client1_->Send("client2", "message", nullptr, nullptr);
+    EXPECT_CALL(observer2_, OnMessageReceived("client1", testing::_))
+        .WillOnce(testing::InvokeWithoutArgs([this] { loop_.Quit(); }));
+  });
+  loop_.Run();
+}
 
 rtc::scoped_refptr<MediaStreamInterface> CreateFakeMediaStream() {
   auto* pcdf = owt::base::PeerConnectionDependencyFactory::Get();
@@ -185,6 +188,21 @@ TEST_F(EndToEndTest, VideoCall) {
   });
   loop_.Run();
 }
+
+TEST_F(EndToEndTest, OnPeerConnectionClosed) {
+  task_queue_->PostTask([this] {
+    client1_->Send("client2", "message", nullptr, nullptr);
+    EXPECT_CALL(observer2_, OnMessageReceived("client1", testing::_))
+        .WillOnce(testing::InvokeWithoutArgs([this] { loop_.Quit(); }));
+  });
+  loop_.Run();
+  task_queue_->PostTask([this] {
+    client1_->Stop("client2", nullptr, nullptr);
+    EXPECT_CALL(observer2_, OnPeerConnectionClosed("client1"))
+        .WillOnce(testing::InvokeWithoutArgs([this] { loop_.Quit(); }));
+  });
+  loop_.Run();
+}
 }  // namespace test
 }  // namespace p2p
 }  // namespace owt