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

Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit

Browse Source
This commit is contained in:
xiongziliang 2021-03-14 10:34:33 +08:00
commit a0fc494ee3
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/WebApi.cpp
View File

@ -851,7 +851,7 @@ void installWebApi() {
return;
}
auto server = it->second;
server->pauseRtpCheck();
server->pauseRtpCheck(allArgs["stream_id"]);
val["hit"] = 1;
});
@ -866,7 +866,7 @@ void installWebApi() {
return;
}
auto server = it->second;
server->resumeRtpCheck();
server->resumeRtpCheck(allArgs["stream_id"]);
val["hit"] = 1;
});

21
src/Rtp/RtpServer.cpp
View File

@ -160,15 +160,30 @@ uint16_t RtpServer::getPort() {
return _udp_server ? _udp_server->get_local_port() : 0;
}
void RtpServer::pauseRtpCheck(){
void RtpServer::pauseRtpCheck(const string &stream_id){
if(_rtp_process)
_rtp_process->setStopCheckRtp(true);
else{
if(!stream_id.empty()){
auto rtp_process = RtpSelector::Instance().getProcess(stream_id,false);
if(rtp_process)
rtp_process->setStopCheckRtp(true);
}
}
}
void RtpServer::resumeRtpCheck(){
void RtpServer::resumeRtpCheck(const string &stream_id){
if(_rtp_process)
_rtp_process->setStopCheckRtp(false);
else{
//解决不指定流或者TCP收流无法暂停
if(!stream_id.empty()){
auto rtp_process = RtpSelector::Instance().getProcess(stream_id,false);
if(rtp_process)
rtp_process->setStopCheckRtp(false);
}
}
}
}//namespace mediakit

4
src/Rtp/RtpServer.h
View File

@ -60,12 +60,12 @@ public:
/**
* 暂停Rtp服务的RTP流检测
*/
void pauseRtpCheck();
void pauseRtpCheck(const string &stream_id = "");
/**
* 恢复Rtp服务的RTP流检测
*/
void resumeRtpCheck();
void resumeRtpCheck(const string &stream_id = "");
protected:
Socket::Ptr _udp_server;