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

推流器主动断开时，避免开启断流续推功能

Browse Source
This commit is contained in:
xiongziliang 2022-07-02 15:36:32 +08:00
parent 7a24a22661
commit 121b78e5dd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Rtmp/RtmpSession.cpp
View File

@ -219,10 +219,11 @@ void RtmpSession::onCmd_publish(AMFDecoder &dec) {
}
void RtmpSession::onCmd_deleteStream(AMFDecoder &dec) {
_push_src = nullptr;
//此时回复可能触发broken pipe事件，从而直接触发onError回调；所以需要先把_push_src置空，防止触发断流续推功能
sendStatus({ "level", "status",
"code", "NetStream.Unpublish.Success",
"description", "Stop publishing." });
_push_src = nullptr;
throw std::runtime_error(StrPrinter << "Stop publishing" << endl);
}

3
src/Rtsp/RtspSession.cpp
View File

@ -867,8 +867,9 @@ void RtspSession::handleReq_Pause(const Parser &parser) {
}
void RtspSession::handleReq_Teardown(const Parser &parser) {
sendRtspResponse("200 OK");
_push_src = nullptr;
//此时回复可能触发broken pipe事件，从而直接触发onError回调；所以需要先把_push_src置空，防止触发断流续推功能
sendRtspResponse("200 OK");
throw SockException(Err_shutdown,"recv teardown request");
}