优化pauseRtpCheck接口，新增pause_seconds参数

主动或无人观看关闭流可能会由于线程安全问题导致崩溃

api/source/mk_rtp_server.cpp

@@ -102,7 +102,7 @@ API_EXPORT void API_CALL mk_rtp_pause_check(const char *app, const char *stream)
     auto src = MediaSource::find(DEFAULT_VHOST, app, stream);
     auto process = src ? src->getRtpProcess() : nullptr;
     if (process) {
-        process->setStopCheckRtp(true);
+        process->pauseRtpTimeout(true);
     }
 }
 
@@ -110,7 +110,7 @@ API_EXPORT void API_CALL mk_rtp_resume_check(const char *app, const char *stream
     auto src = MediaSource::find(DEFAULT_VHOST, app, stream);
     auto process = src ? src->getRtpProcess() : nullptr;
     if (process) {
-        process->setStopCheckRtp(false);
+        process->pauseRtpTimeout(false);
     }
 }
 

postman/ZLMediaKit.postman_collection.json

@@ -2019,6 +2019,12 @@
 							"key": "stream_id",
 							"value": "test",
 							"description": "该端口绑定的流id"
+						},
+						{
+							"key": "pause_seconds",
+							"value": "300",
+							"description": "暂停超时监测后，将在pause_seconds时间后恢复",
+							"disabled": true
 						}
 					]
 				}

server/WebApi.cpp

@@ -1106,9 +1106,8 @@ void installWebApi() {
 
         bool force = allArgs["force"].as<bool>();
         for (auto &media : media_list) {
-            if (media->close(force)) {
+            media->getOwnerPoller()->async([media, force]() { media->close(force); });
-                ++count_closed;
+            ++count_closed;
-            }
         }
         val["count_hit"] = count_hit;
         val["count_closed"] = count_closed;
@@ -1735,7 +1734,7 @@ void installWebApi() {
         auto src = MediaSource::find(vhost, app, allArgs["stream_id"]);
         auto process = src ? src->getRtpProcess() : nullptr;
         if (process) {
-            process->setStopCheckRtp(true);
+            process->pauseRtpTimeout(true, allArgs["pause_seconds"]);
         } else {
             val["code"] = API::NotFound;
         }
@@ -1755,7 +1754,7 @@ void installWebApi() {
         auto src = MediaSource::find(vhost, app, allArgs["stream_id"]);
         auto process = src ? src->getRtpProcess() : nullptr;
         if (process) {
-            process->setStopCheckRtp(false);
+            process->pauseRtpTimeout(false);
         } else {
             val["code"] = API::NotFound;
         }

server/WebHook.cpp

@@ -634,7 +634,10 @@ void installWebHook() {
             // 边沿站无人观看时如果是拉流的则立即停止溯源  [AUTO-TRANSLATED:a1429c77]
             // If no one is watching at the edge station, stop tracing immediately if it is pulling
             if (!auto_close) {
-                sender.close(false);
+                auto ptr = sender.shared_from_this();
+                sender.getOwnerPoller()->async([ptr]() {
+                    ptr->close(false);
+                });
                 WarnL << "Auto close stream when none reader: " << sender.getOriginUrl();
             }
             return;
@@ -661,7 +664,7 @@ void installWebHook() {
             if (!flag || !err.empty() || !strongSrc) {
                 return;
             }
-            strongSrc->close(false);
+            strongSrc->getOwnerPoller()->async([strongSrc]() { strongSrc->close(false); });
             WarnL << "无人观看主动关闭流:" << strongSrc->getOriginUrl();
         });
     });

src/Common/MediaSource.cpp

@@ -698,13 +698,13 @@ void MediaSourceEvent::onReaderChanged(MediaSource &sender, int size){
                 // 此流被标记为无人观看自动关闭流  [AUTO-TRANSLATED:64a0dac3]
                 // This stream is marked as an automatically closed stream with no viewers.
                 WarnL << "Auto close stream when none reader: " << strong_sender->getUrl();
-                strong_sender->close(false);
+                strong_sender->getOwnerPoller()->async([strong_sender]() { strong_sender->close(false); });
             }
         } else {
             // 这个是mp4点播，我们自动关闭  [AUTO-TRANSLATED:8a7b9a90]
             // This is an mp4 on-demand, we automatically close it.
             WarnL << "MP4点播无人观看,自动关闭:" << strong_sender->getUrl();
-            strong_sender->close(false);
+            strong_sender->getOwnerPoller()->async([strong_sender]() { strong_sender->close(false); });
         }
         return false;
     }, specified_poller);

src/Player/PlayerProxy.cpp

@@ -254,16 +254,9 @@ void PlayerProxy::rePlay(const string &strUrl, int iFailedCnt) {
 bool PlayerProxy::close(MediaSource &sender) {
     // 通知其停止推流  [AUTO-TRANSLATED:d69d10d8]
     // Notify it to stop pushing the stream
-    weak_ptr<PlayerProxy> weakSelf = dynamic_pointer_cast<PlayerProxy>(shared_from_this());
+    _muxer = nullptr;
-    getPoller()->async_first([weakSelf]() {
+    setMediaSource(nullptr);
-        auto strongSelf = weakSelf.lock();
+    teardown();
-        if (!strongSelf) {
-            return;
-        }
-        strongSelf->_muxer.reset();
-        strongSelf->setMediaSource(nullptr);
-        strongSelf->teardown();
-    });
     _on_close(SockException(Err_shutdown, "closed by user"));
     WarnL << "close media: " << sender.getUrl();
     return true;

src/Rtmp/RtmpSession.cpp

@@ -591,9 +591,7 @@ void RtmpSession::onSendMedia(const RtmpPacket::Ptr &pkt) {
 }
 
 bool RtmpSession::close(MediaSource &sender) {
-    //此回调在其他线程触发
+    shutdown(SockException(Err_shutdown, "close media: " + sender.getUrl()));
-    string err = StrPrinter << "close media: " << sender.getUrl();
-    safeShutdown(SockException(Err_shutdown, err));
     return true;
 }
 

src/Rtp/RtpProcess.cpp

@@ -203,27 +203,24 @@ void RtpProcess::doCachedFunc() {
 }
 
 bool RtpProcess::alive() {
-    if (_stop_rtp_check.load()) {
+    if (_pause_timeout) {
-        if(_last_check_alive.elapsedTime() > 5 * 60 * 1000){
+        if (_last_check_alive.elapsedTime() < _pause_seconds * 1000) {
-            // 最多暂停5分钟的rtp超时检测，因为NAT映射有效期一般不会太长  [AUTO-TRANSLATED:2df59aad]
-            // Pause the RTP timeout detection for a maximum of 5 minutes, because the NAT mapping validity period is generally not very long.
-            _stop_rtp_check = false;
-        } else {
             return true;
         }
+        // 最多暂停_pause_seconds秒的rtp超时检测，因为NAT映射有效期一般不会太长
+        _pause_timeout = false;
     }
 
     _last_check_alive.resetTime();
     GET_CONFIG(uint64_t, timeoutSec, RtpProxy::kTimeoutSec)
-    if (_last_frame_time.elapsedTime() / 1000 < timeoutSec) {
+    return _last_frame_time.elapsedTime() < timeoutSec * 1000;
-        return true;
-    }
-    return false;
 }
 
-void RtpProcess::setStopCheckRtp(bool is_check){
+void RtpProcess::pauseRtpTimeout(bool pause, uint32_t pause_seconds) {
-    _stop_rtp_check = is_check;
+    _pause_timeout = pause;
-    if (!is_check) {
+    // 默认5分钟恢复超时监测
+    _pause_seconds = pause_seconds ? pause_seconds : 300;
+    if (!pause) {
         _last_frame_time.resetTime();
     }
 }

src/Rtp/RtpProcess.h

@@ -69,12 +69,11 @@ public:
     void setOnDetach(onDetachCB cb);
 
     /**
-     * 设置onDetach事件回调,false检查RTP超时，true停止
+     * 暂停或恢复rtp超时监测
-     * Set onDetach event callback, false checks RTP timeout, true stops
+     * @param pause 是否暂停超时检测
-     
+     * @param pause_seconds 暂停超时检测最大时间(单位秒)，超过这个时间后将恢复超时检测; 设置为0时默认为300
-     * [AUTO-TRANSLATED:2780397f]
      */
-    void setStopCheckRtp(bool is_check=false);
+    void pauseRtpTimeout(bool pause, uint32_t pause_seconds = 0);
 
     /**
      * 设置为单track，单音频/单视频时可以加快媒体注册速度
@@ -129,10 +128,12 @@ private:
     void createTimer();
 
 private:
-    OnlyTrack _only_track = kAll;
+    bool _pause_timeout = false;
-    std::string _auth_err;
+    uint32_t _pause_seconds = 5 * 60;
     uint64_t _dts = 0;
     uint64_t _total_bytes = 0;
+    OnlyTrack _only_track = kAll;
+    std::string _auth_err;
     std::unique_ptr<sockaddr_storage> _addr;
     toolkit::Socket::Ptr _sock;
     MediaInfo _media_info;
@@ -142,7 +143,6 @@ private:
     std::shared_ptr<FILE> _save_file_video;
     ProcessInterface::Ptr _process;
     MultiMediaSourceMuxer::Ptr _muxer;
-    std::atomic_bool _stop_rtp_check{false};
     toolkit::Timer::Ptr _timer;
     toolkit::Ticker _last_check_alive;
     std::recursive_mutex _func_mtx;

src/Rtsp/RtspSession.cpp

@@ -1175,9 +1175,7 @@ int RtspSession::getTrackIndexByInterleaved(int interleaved) {
 }
 
 bool RtspSession::close(MediaSource &sender) {
-    //此回调在其他线程触发
+    shutdown(SockException(Err_shutdown,"close media: " + sender.getUrl()));
-    string err = StrPrinter << "close media: " << sender.getUrl();
-    safeShutdown(SockException(Err_shutdown,err));
     return true;
 }
 

src/Shell/ShellCMD.h

@@ -36,9 +36,9 @@ public:
                             if (!media) {
                                 break;
                             }
-                            if (!media->close(true)) {
+                            media->getOwnerPoller()->async([media]() {
-                                break;
+                                media->close(true);
-                            }
+                            });
                             (*stream) << "\t踢出成功:" << media->getUrl() << "\r\n";
                             return;
                         } while (0);

srt/SrtTransportImp.cpp

@@ -145,16 +145,8 @@ void SrtTransportImp::onShutdown(const SockException &ex) {
 }
 
 bool SrtTransportImp::close(mediakit::MediaSource &sender) {
-    std::string err = StrPrinter << "close media: " << sender.getUrl();
+    onShutdown(SockException(Err_shutdown, "close media: " + sender.getUrl()));
-    weak_ptr<SrtTransportImp> weak_self = static_pointer_cast<SrtTransportImp>(shared_from_this());
+    _muxer = nullptr;
-    getPoller()->async([weak_self, err]() {
-        auto strong_self = weak_self.lock();
-        if (strong_self) {
-            strong_self->onShutdown(SockException(Err_shutdown, err));
-            // 主动关闭推流，那么不延时注销
-            strong_self->_muxer = nullptr;
-        }
-    });
     return true;
 }
 

webrtc/WebRtcPusher.cpp

@@ -42,19 +42,10 @@ WebRtcPusher::WebRtcPusher(const EventPoller::Ptr &poller,
 }
 
 bool WebRtcPusher::close(MediaSource &sender) {
-    // 此回调在其他线程触发  [AUTO-TRANSLATED:c98e7686]
+    onShutdown(SockException(Err_shutdown, "close media: " + sender.getUrl()));
-    // This callback is triggered in another thread
+    // 主动关闭推流，那么不延时注销  [AUTO-TRANSLATED:ee7cc580]
-    string err = StrPrinter << "close media: " << sender.getUrl();
+    // Actively close the stream, then do not delay the logout
-    weak_ptr<WebRtcPusher> weak_self = static_pointer_cast<WebRtcPusher>(shared_from_this());
+    _push_src = nullptr;
-    getPoller()->async([weak_self, err]() {
-        auto strong_self = weak_self.lock();
-        if (strong_self) {
-            strong_self->onShutdown(SockException(Err_shutdown, err));
-            // 主动关闭推流，那么不延时注销  [AUTO-TRANSLATED:ee7cc580]
-            // Actively close the stream, then do not delay the logout
-            strong_self->_push_src = nullptr;
-        }
-    });
     return true;
 }