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

修复重连时，创建多个mp4解复用器导致内存增长的bug:#895

Browse Source
This commit is contained in:
ziyue 2021-06-10 14:45:26 +08:00
parent 92f879d703
commit 24ab876fdb
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
tests/test_pusherMp4.cpp
View File

@ -24,9 +24,9 @@ using namespace toolkit;
using namespace mediakit; using namespace mediakit;
//推流器，保持强引用 //推流器，保持强引用
MediaPusher::Ptr pusher; MediaPusher::Ptr g_pusher;
Timer::Ptr g_timer; Timer::Ptr g_timer;
MediaSource::Ptr g_src;
//声明函数 //声明函数
//推流失败或断开延迟2秒后重试推流 //推流失败或断开延迟2秒后重试推流
@ -36,7 +36,7 @@ void rePushDelay(const EventPoller::Ptr &poller,
const string &app, const string &app,
const string &stream, const string &stream,
const string &filePath, const string &filePath,
const string &url) ; const string &url);
//创建推流器并开始推流 //创建推流器并开始推流
void createPusher(const EventPoller::Ptr &poller, void createPusher(const EventPoller::Ptr &poller,
@ -46,36 +46,39 @@ void createPusher(const EventPoller::Ptr &poller,
const string &stream, const string &stream,
const string &filePath, const string &filePath,
const string &url) { const string &url) {
//不限制APP名，并且指定文件绝对路径 if (!g_src) {
auto src = MediaSource::createFromMP4(schema,vhost,app,stream,filePath, false); //不限制APP名，并且指定文件绝对路径
if(!src){ g_src = MediaSource::createFromMP4(schema, vhost, app, stream, filePath, false);
}
if (!g_src) {
//文件不存在 //文件不存在
WarnL << "MP4文件不存在:" << filePath; WarnL << "MP4文件不存在:" << filePath;
return; return;
} }
//创建推流器并绑定一个MediaSource //创建推流器并绑定一个MediaSource
pusher.reset(new MediaPusher(src,poller)); g_pusher.reset(new MediaPusher(g_src, poller));
//可以指定rtsp推流方式，支持tcp和udp方式，默认tcp //可以指定rtsp推流方式，支持tcp和udp方式，默认tcp
// (*pusher)[Client::kRtpType] = Rtsp::RTP_UDP; //(*g_pusher)[Client::kRtpType] = Rtsp::RTP_UDP;
//设置推流中断处理逻辑 //设置推流中断处理逻辑
pusher->setOnShutdown([poller,schema,vhost,app,stream,filePath, url](const SockException &ex) { g_pusher->setOnShutdown([poller, schema, vhost, app, stream, filePath, url](const SockException &ex) {
WarnL << "Server connection is closed:" << ex.getErrCode() << " " << ex.what(); WarnL << "Server connection is closed:" << ex.getErrCode() << " " << ex.what();
//重新推流 //重新推流
rePushDelay(poller,schema,vhost,app, stream,filePath, url); rePushDelay(poller, schema, vhost, app, stream, filePath, url);
}); });
//设置发布结果处理逻辑 //设置发布结果处理逻辑
pusher->setOnPublished([poller,schema,vhost,app,stream,filePath, url](const SockException &ex) { g_pusher->setOnPublished([poller, schema, vhost, app, stream, filePath, url](const SockException &ex) {
if (ex) { if (ex) {
WarnL << "Publish fail:" << ex.getErrCode() << " " << ex.what(); WarnL << "Publish fail:" << ex.getErrCode() << " " << ex.what();
//如果发布失败，就重试 //如果发布失败，就重试
rePushDelay(poller,schema,vhost,app, stream, filePath ,url); rePushDelay(poller, schema, vhost, app, stream, filePath, url);
}else { } else {
InfoL << "Publish success,Please play with player:" << url; InfoL << "Publish success,Please play with player:" << url;
} }
}); });
pusher->publish(url); g_pusher->publish(url);
} }
//推流失败或断开延迟2秒后重试推流 //推流失败或断开延迟2秒后重试推流
@ -86,39 +89,44 @@ void rePushDelay(const EventPoller::Ptr &poller,
const string &stream, const string &stream,
const string &filePath, const string &filePath,
const string &url) { const string &url) {
g_timer = std::make_shared<Timer>(2.0f,[poller,schema,vhost,app, stream, filePath,url]() { g_timer = std::make_shared<Timer>(2.0f, [poller, schema, vhost, app, stream, filePath, url]() {
InfoL << "Re-Publishing..."; InfoL << "Re-Publishing...";
//重新推流 //重新推流
createPusher(poller,schema,vhost,app, stream, filePath,url); createPusher(poller, schema, vhost, app, stream, filePath, url);
//此任务不重复 //此任务不重复
return false; return false;
}, poller); }, poller);
} }
//这里才是真正执行main函数，你可以把函数名(domain)改成main，然后就可以输入自定义url了 //这里才是真正执行main函数，你可以把函数名(domain)改成main，然后就可以输入自定义url了
int domain(const string & filePath,const string & pushUrl){ int domain(const string &filePath, const string &pushUrl) {
//设置日志 //设置日志
Logger::Instance().add(std::make_shared<ConsoleChannel>()); Logger::Instance().add(std::make_shared<ConsoleChannel>());
Logger::Instance().setWriter(std::make_shared<AsyncLogWriter>()); Logger::Instance().setWriter(std::make_shared<AsyncLogWriter>());
//循环点播mp4文件
mINI::Instance()[Record::kFileRepeat] = 1;
mINI::Instance()[General::kHlsDemand] = 1;
mINI::Instance()[General::kTSDemand] = 1;
mINI::Instance()[General::kFMP4Demand] = 1;
//mINI::Instance()[General::kRtspDemand] = 1;
//mINI::Instance()[General::kRtmpDemand] = 1;
auto poller = EventPollerPool::Instance().getPoller(); auto poller = EventPollerPool::Instance().getPoller();
//vhost/app/stream可以随便自己填，现在不限制app应用名了 //vhost/app/stream可以随便自己填，现在不限制app应用名了
createPusher(poller,FindField(pushUrl.data(), nullptr,"://").substr(0,4),DEFAULT_VHOST,"live","stream",filePath,pushUrl); createPusher(poller, FindField(pushUrl.data(), nullptr, "://").substr(0, 4), DEFAULT_VHOST, "live", "stream", filePath, pushUrl);
//设置退出信号处理函数 //设置退出信号处理函数
static semaphore sem; static semaphore sem;
signal(SIGINT, [](int) { sem.post(); });// 设置退出信号 signal(SIGINT, [](int) { sem.post(); });// 设置退出信号
sem.wait(); sem.wait();
pusher.reset(); g_pusher.reset();
g_timer.reset(); g_timer.reset();
return 0; return 0;
} }
int main(int argc, char *argv[]) {
int main(int argc,char *argv[]){
//可以使用test_server生成的mp4文件 //可以使用test_server生成的mp4文件
//文件使用绝对路径，推流url支持rtsp和rtmp //文件使用绝对路径，推流url支持rtsp和rtmp
return domain("/Users/xzl/git/ZLMediaKit/release/mac/Debug/www/record/live/rtsp_test1/2020-04-03/15-32-24.mp4","rtsp://127.0.0.1/live/rtsp_push"); return domain("/home/work/test2.mp4", "rtmp://127.0.0.1/live/rtsp_push");
} }