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

格式化代码

Browse Source
This commit is contained in:
夏楚 2022-11-12 01:52:49 +00:00
parent bc63142712
commit a37268f003
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/WebHook.cpp
View File

@ -650,9 +650,9 @@ void installWebHook(){
}); });
}); });
NoticeCenter::Instance().addListener(&web_hook_tag,Broadcast::KBroadcastRtpServerTimeout,[](BroadcastRtpServerTimeout){ NoticeCenter::Instance().addListener(&web_hook_tag, Broadcast::KBroadcastRtpServerTimeout, [](BroadcastRtpServerTimeout) {
GET_CONFIG(string,rtp_server_timeout,Hook::kOnRtpServerTimeout); GET_CONFIG(string, rtp_server_timeout, Hook::kOnRtpServerTimeout);
if(!hook_enable || rtp_server_timeout.empty()){ if (!hook_enable || rtp_server_timeout.empty()) {
return; return;
} }
@ -662,8 +662,7 @@ void installWebHook(){
body["tcp_mode"] = tcp_mode; body["tcp_mode"] = tcp_mode;
body["re_use_port"] = re_use_port; body["re_use_port"] = re_use_port;
body["ssrc"] = ssrc; body["ssrc"] = ssrc;
do_http_hook(rtp_server_timeout,body); do_http_hook(rtp_server_timeout, body);
}); });
//汇报服务器重新启动 //汇报服务器重新启动

18
src/Rtp/RtpServer.cpp
View File

@ -36,14 +36,13 @@ public:
_stream_id = std::move(stream_id); _stream_id = std::move(stream_id);
} }
~RtcpHelper() { ~RtcpHelper() {
if (_process) { if (_process) {
// 删除rtp处理器 // 删除rtp处理器
RtpSelector::Instance().delProcess(_stream_id, _process.get()); RtpSelector::Instance().delProcess(_stream_id, _process.get());
} }
} }
void setRtpServerInfo(uint16_t local_port,RtpServer::TcpMode mode,bool re_use_port,uint32_t ssrc){ void setRtpServerInfo(uint16_t local_port,RtpServer::TcpMode mode,bool re_use_port,uint32_t ssrc){
_local_port = local_port; _local_port = local_port;
_tcp_mode = mode; _tcp_mode = mode;
@ -98,16 +97,16 @@ public:
if (!process && strong_self->_on_detach) { if (!process && strong_self->_on_detach) {
strong_self->_on_detach(); strong_self->_on_detach();
} }
if(!process){ // process 未创建，触发rtp server 超时事件 if (!process) { // process 未创建，触发rtp server 超时事件
NoticeCenter::Instance().emitEvent(Broadcast::KBroadcastRtpServerTimeout,strong_self->_local_port,strong_self->_stream_id,(int)strong_self->_tcp_mode,strong_self->_re_use_port,strong_self->_ssrc); NoticeCenter::Instance().emitEvent(Broadcast::KBroadcastRtpServerTimeout,strong_self->_local_port,strong_self->_stream_id,(int)strong_self->_tcp_mode,strong_self->_re_use_port,strong_self->_ssrc);
} }
} }
return 0; return 0;
}); });
} }
void cancelDelayTask(){ void cancelDelayTask() {
if(_delay_task){ if (_delay_task) {
_delay_task->cancel(); _delay_task->cancel();
_delay_task = nullptr; _delay_task = nullptr;
} }
@ -135,11 +134,10 @@ private:
} }
private: private:
uint16_t _local_port = 0;
RtpServer::TcpMode _tcp_mode = RtpServer::NONE;
bool _re_use_port = false; bool _re_use_port = false;
uint16_t _local_port = 0;
uint32_t _ssrc = 0; uint32_t _ssrc = 0;
RtpServer::TcpMode _tcp_mode = RtpServer::NONE;
Ticker _ticker; Ticker _ticker;
Socket::Ptr _rtcp_sock; Socket::Ptr _rtcp_sock;