amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-25 12:11:36 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

主动关闭的流不支持断流续推: #1401

Browse Source
This commit is contained in:
ziyue 2022-02-09 14:31:40 +08:00
parent 595182cebb
commit 72caa43c97
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpart/ZLToolKit

@ -1 +1 @@
Subproject commit 40c09a4865026de94cdc1ad874aeba580bf15fdf Subproject commit b7fc45deae0421a5116de95a4a6eca4798bdecbc

3
src/Rtmp/RtmpSession.cpp
View File

@ -45,7 +45,8 @@ void RtmpSession::onError(const SockException& err) {
} }
GET_CONFIG(uint32_t, continue_push_ms, General::kContinuePushMS); GET_CONFIG(uint32_t, continue_push_ms, General::kContinuePushMS);
if (_push_src && continue_push_ms) { //如果是主动关闭的，那么不延迟注销
if (_push_src && continue_push_ms && err.getErrCode() != Err_shutdown) {
//取消所有权 //取消所有权
_push_src_ownership = nullptr; _push_src_ownership = nullptr;
//延时10秒注销流 //延时10秒注销流

3
src/Rtsp/RtspSession.cpp
View File

@ -87,7 +87,8 @@ void RtspSession::onError(const SockException &err) {
} }
GET_CONFIG(uint32_t, continue_push_ms, General::kContinuePushMS); GET_CONFIG(uint32_t, continue_push_ms, General::kContinuePushMS);
if (_push_src && continue_push_ms) { //如果是主动关闭的，那么不延迟注销
if (_push_src && continue_push_ms && err.getErrCode() != Err_shutdown) {
//取消所有权 //取消所有权
_push_src_ownership = nullptr; _push_src_ownership = nullptr;
//延时10秒注销流 //延时10秒注销流

2
webrtc/WebRtcPusher.cpp
View File

@ -47,6 +47,8 @@ bool WebRtcPusher::close(MediaSource &sender, bool force) {
auto strong_self = weak_self.lock(); auto strong_self = weak_self.lock();
if (strong_self) { if (strong_self) {
strong_self->onShutdown(SockException(Err_shutdown, err)); strong_self->onShutdown(SockException(Err_shutdown, err));
//主动关闭推流，那么不延时注销
strong_self->_push_src = nullptr;
} }
}); });
return true; return true;