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

RtpServer确保超时回收

Browse Source
This commit is contained in:
ziyue 2022-11-01 17:54:41 +08:00
parent 2cdeddeb2c
commit 5877d3942e
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Rtp/RtpServer.cpp
View File

@ -55,6 +55,8 @@ public:
if (!_process) { if (!_process) {
_process = RtpSelector::Instance().getProcess(_stream_id, true); _process = RtpSelector::Instance().getProcess(_stream_id, true);
_process->setOnDetach(std::move(_on_detach)); _process->setOnDetach(std::move(_on_detach));
_delay_task->cancel();
_delay_task = nullptr;
} }
_process->inputRtp(true, sock, buf->data(), buf->size(), addr); _process->inputRtp(true, sock, buf->data(), buf->size(), addr);
@ -81,6 +83,17 @@ public:
strong_self->_process->onRtcp(rtcp); strong_self->_process->onRtcp(rtcp);
} }
}); });
GET_CONFIG(uint64_t, timeoutSec, RtpProxy::kTimeoutSec);
_delay_task = _rtcp_sock->getPoller()->doDelayTask(timeoutSec * 1000, [weak_self]() {
if (auto strong_self = weak_self.lock()) {
auto process = RtpSelector::Instance().getProcess(strong_self->_stream_id, false);
if (!process && strong_self->_on_detach) {
strong_self->_on_detach();
}
}
return 0;
});
} }
private: private:
@ -111,6 +124,7 @@ private:
std::string _stream_id; std::string _stream_id;
function<void()> _on_detach; function<void()> _on_detach;
std::shared_ptr<struct sockaddr_storage> _rtcp_addr; std::shared_ptr<struct sockaddr_storage> _rtcp_addr;
EventPoller::DelayTask::Ptr _delay_task;
}; };
void RtpServer::start(uint16_t local_port, const string &stream_id, TcpMode tcp_mode, const char *local_ip, bool re_use_port, uint32_t ssrc) { void RtpServer::start(uint16_t local_port, const string &stream_id, TcpMode tcp_mode, const char *local_ip, bool re_use_port, uint32_t ssrc) {