Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-25 11:12:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

on_publish hook新增continue_push_ms参数，用于断连续推延时控制

Browse Source
This commit is contained in:
xiongziliang
2022-06-04 11:06:35 +08:00
parent b0beea7781
commit b23cbaa0f8
10 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/WebRtcPusher.cpp
View File

@@ -16,8 +16,9 @@ using namespace mediakit;
WebRtcPusher::Ptr WebRtcPusher::create(const EventPoller::Ptr &poller,
const RtspMediaSourceImp::Ptr &src,
const std::shared_ptr<void> &ownership,
const MediaInfo &info) {
WebRtcPusher::Ptr ret(new WebRtcPusher(poller, src, ownership, info), [](WebRtcPusher *ptr) {
const MediaInfo &info,
const mediakit::ProtocolOption &option) {
WebRtcPusher::Ptr ret(new WebRtcPusher(poller, src, ownership, info, option), [](WebRtcPusher *ptr) {
ptr->onDestory();
delete ptr;
});
@@ -28,10 +29,12 @@ WebRtcPusher::Ptr WebRtcPusher::create(const EventPoller::Ptr &poller,
WebRtcPusher::WebRtcPusher(const EventPoller::Ptr &poller,
const RtspMediaSourceImp::Ptr &src,
const std::shared_ptr<void> &ownership,
const MediaInfo &info) : WebRtcTransportImp(poller) {
const MediaInfo &info,
const mediakit::ProtocolOption &option) : WebRtcTransportImp(poller) {
_media_info = info;
_push_src = src;
_push_src_ownership = ownership;
_continue_push_ms = option.continue_push_ms;
CHECK(_push_src);
}
@@ -130,13 +133,12 @@ void WebRtcPusher::onDestory() {
}
}
GET_CONFIG(uint32_t, continue_push_ms, General::kContinuePushMS);
if (_push_src && continue_push_ms) {
if (_push_src && _continue_push_ms) {
//取消所有权
_push_src_ownership = nullptr;
//延时10秒注销流
auto push_src = std::move(_push_src);
getPoller()->doDelayTask(continue_push_ms, [push_src]() { return 0; });
getPoller()->doDelayTask(_continue_push_ms, [push_src]() { return 0; });
}
}