From b2ff53037b99189853612c612b1e0d80c7f00243 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Wed, 8 Jul 2020 10:25:30 +0800
Subject: [PATCH] =?UTF-8?q?http=20api=E6=96=B0=E5=BB=BA=E7=9A=84rtp?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=8F=AF=E4=BB=A5=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E7=A7=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/WebApi.cpp       | 13 +++++++++++--
 src/Rtp/RtpProcess.cpp  | 10 ++++++++++
 src/Rtp/RtpProcess.h    | 11 +++++++++++
 src/Rtp/RtpSelector.cpp |  2 ++
 src/Rtp/RtpServer.cpp   |  7 +++++++
 src/Rtp/RtpServer.h     |  6 ++++++
 6 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/server/WebApi.cpp b/server/WebApi.cpp
index 1980ee02..bbfc803d 100644
--- a/server/WebApi.cpp
+++ b/server/WebApi.cpp
@@ -761,11 +761,20 @@ void installWebApi() {
 
         RtpServer::Ptr server = std::make_shared<RtpServer>();
         server->start(allArgs["port"], allArgs["stream_id"], allArgs["enable_tcp"].as<bool>());
-        val["port"] = server->getPort();
+
+        auto port = server->getPort();
+        server->setOnDetach([port]() {
+            //设置rtp超时移除事件
+            lock_guard<recursive_mutex> lck(s_rtpServerMapMtx);
+            s_rtpServerMap.erase(port);
+        });
 
         //保存对象
         lock_guard<recursive_mutex> lck(s_rtpServerMapMtx);
-        s_rtpServerMap.emplace(server->getPort(), server);
+        s_rtpServerMap.emplace(port, server);
+
+        //回复json
+        val["port"] = port;
     });
 
     api_regist1("/index/api/closeRtpServer",[](API_ARGS1){
diff --git a/src/Rtp/RtpProcess.cpp b/src/Rtp/RtpProcess.cpp
index b3f32d19..0693ddae 100644
--- a/src/Rtp/RtpProcess.cpp
+++ b/src/Rtp/RtpProcess.cpp
@@ -177,6 +177,16 @@ bool RtpProcess::alive() {
     return false;
 }
 
+void RtpProcess::onDetach(){
+    if(_on_detach){
+        _on_detach();
+    }
+}
+
+void RtpProcess::setOnDetach(const function<void()> &cb) {
+    _on_detach = cb;
+}
+
 string RtpProcess::get_peer_ip() {
     if(_addr){
         return SockUtil::inet_ntoa(((struct sockaddr_in *) _addr)->sin_addr);
diff --git a/src/Rtp/RtpProcess.h b/src/Rtp/RtpProcess.h
index 1f53451b..81dc7f2f 100644
--- a/src/Rtp/RtpProcess.h
+++ b/src/Rtp/RtpProcess.h
@@ -44,6 +44,16 @@ public:
      */
     bool alive();
 
+    /**
+     * 超时时被RtpSelector移除时触发
+     */
+    void onDetach();
+
+    /**
+     * 设置onDetach事件回调
+     */
+    void setOnDetach(const function<void()> &cb);
+
     /// SockInfo override
     string get_local_ip() override;
     uint16_t get_local_port() override;
@@ -79,6 +89,7 @@ private:
     MediaInfo _media_info;
     uint64_t _total_bytes = 0;
     Socket::Ptr _sock;
+    function<void()> _on_detach;
 };
 
 }//namespace mediakit
diff --git a/src/Rtp/RtpSelector.cpp b/src/Rtp/RtpSelector.cpp
index 06979972..fb790048 100644
--- a/src/Rtp/RtpSelector.cpp
+++ b/src/Rtp/RtpSelector.cpp
@@ -91,7 +91,9 @@ void RtpSelector::onManager() {
             continue;
         }
         WarnL << "RtpProcess timeout:" << it->first;
+        auto process = it->second->getProcess();
         it = _map_rtp_process.erase(it);
+        process->onDetach();
     }
 }
 
diff --git a/src/Rtp/RtpServer.cpp b/src/Rtp/RtpServer.cpp
index 365aceb2..f7a4c9eb 100644
--- a/src/Rtp/RtpServer.cpp
+++ b/src/Rtp/RtpServer.cpp
@@ -69,6 +69,13 @@ void RtpServer::start(uint16_t local_port, const string &stream_id,  bool enable
 
     _tcp_server = tcp_server;
     _udp_server = udp_server;
+    _rtp_process = process;
+}
+
+void RtpServer::setOnDetach(const function<void()> &cb){
+    if(_rtp_process){
+        _rtp_process->setOnDetach(cb);
+    }
 }
 
 EventPoller::Ptr RtpServer::getPoller() {
diff --git a/src/Rtp/RtpServer.h b/src/Rtp/RtpServer.h
index 2623ae2b..bcc045bc 100644
--- a/src/Rtp/RtpServer.h
+++ b/src/Rtp/RtpServer.h
@@ -52,9 +52,15 @@ public:
      */
     EventPoller::Ptr getPoller();
 
+    /**
+     * 设置RtpProcess onDetach事件回调
+     */
+    void setOnDetach(const function<void()> &cb);
+
 protected:
     Socket::Ptr _udp_server;
     TcpServer::Ptr _tcp_server;
+    RtpProcess::Ptr _rtp_process;
     function<void()> _on_clearup;
 };