Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-04 01:37:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

完善addStreamPusherProxy相关功能并修复自动删除相关的bug

Browse Source
This commit is contained in:
ziyue
2021-06-17 10:59:58 +08:00
parent aa39680c69
commit 752590f804
3 changed files with 17 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Pusher/PusherProxy.cpp
View File

@@ -14,13 +14,8 @@ using namespace toolkit;
namespace mediakit {
PusherProxy::PusherProxy(const string& schema, const string &vhost, const string &app, const string &stream,
int retry_count, const EventPoller::Ptr &poller)
: MediaPusher(schema,vhost, app, stream, poller){
_schema = schema;
_vhost = vhost;
_app = app;
_stream_id = stream;
PusherProxy::PusherProxy(const MediaSource::Ptr &src, int retry_count, const EventPoller::Ptr &poller)
: MediaPusher(src, poller){
_retry_count = retry_count;
_on_close = [](const SockException &) {};
}
@@ -53,7 +48,7 @@ void PusherProxy::publish(const string& dstUrl) {
if (!err) {
// 推流成功
*piFailedCnt = 0;
InfoL << "pusher publish " << dstUrl << " success";
InfoL << "Publish " << dstUrl << " success";
} else if (*piFailedCnt < strongSelf->_retry_count || strongSelf->_retry_count < 0) {
// 推流失败，延时重试推送
strongSelf->rePublish(dstUrl, (*piFailedCnt)++);
@@ -77,7 +72,6 @@ void PusherProxy::publish(const string& dstUrl) {
});
MediaPusher::publish(dstUrl);
_publish_url = dstUrl;
}
void PusherProxy::rePublish(const string &dstUrl, int iFailedCnt) {

11
src/Pusher/PusherProxy.h
View File

@@ -24,10 +24,8 @@ public:
typedef std::shared_ptr<PusherProxy> Ptr;
// 如果retry_count<0,则一直重试播放；否则重试retry_count次数
// 默认一直重试，创建此对象时候，需要外部保证mediaSource存在
PusherProxy(const string& schema, const string &vhost, const string &app, const string &stream,
int retry_count = -1, const EventPoller::Ptr &poller = nullptr);
// 默认一直重试，创建此对象时候，需要外部保证MediaSource存在
PusherProxy(const MediaSource::Ptr &src, int retry_count = -1, const EventPoller::Ptr &poller = nullptr);
~PusherProxy() override;
/**
@@ -54,11 +52,6 @@ private:
private:
int _retry_count;
std::string _schema;
string _vhost;
string _app;
string _stream_id;
std::string _publish_url;
Timer::Ptr _timer;
function<void(const SockException &ex)> _on_close;