Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-01 07:22:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化关闭媒体源相关逻辑: #1963

Browse Source
This commit is contained in:
ziyue
2022-09-18 20:36:47 +08:00
parent daafe62f35
commit 15affeff1d
21 changed files with 44 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Rtsp/RtspSession.cpp
View File

@@ -1136,12 +1136,9 @@ int RtspSession::getTrackIndexByInterleaved(int interleaved) {
throw SockException(Err_shutdown, StrPrinter << "no such track with interleaved:" << interleaved);
}
bool RtspSession::close(MediaSource &sender, bool force) {
bool RtspSession::close(MediaSource &sender) {
//此回调在其他线程触发
if(!_push_src || (!force && _push_src->totalReaderCount())){
return false;
}
string err = StrPrinter << "close media:" << sender.getUrl() << " " << force;
string err = StrPrinter << "close media: " << sender.getUrl();
safeShutdown(SockException(Err_shutdown,err));
return true;
}

2
src/Rtsp/RtspSession.h
View File

@@ -82,7 +82,7 @@ protected:
///////MediaSourceEvent override///////
// 关闭
bool close(MediaSource &sender, bool force) override;
bool close(MediaSource &sender) override;
// 播放总人数
int totalReaderCount(MediaSource &sender) override;
// 获取媒体源类型