THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1, 增加一下日志输出

This commit is contained in:
chenlei 2019-07-30 12:21:53 +08:00
parent 722bf96634
commit c9d913929e
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/Dockerfile
View File

@ -1,5 +1,5 @@
################################################################# #################################################################
# 在项目根目录执行 docker build -t cl-zlmedia -f ./docker/Dockerfile . # 在项目根目录执行 docker build -t nexus.docker.kefen.site:7300/kefen/cl-zlmedia -f ./docker/Dockerfile .
################################################################# #################################################################
#基础 #基础

2
server/main.cpp
View File

@ -222,7 +222,7 @@ void initEventListener() {
bool vOnDemand = tProxyData.get("on_demand",true).asBool(); bool vOnDemand = tProxyData.get("on_demand",true).asBool();
bool realOnDemand = vRecordMp4 ? false : vOnDemand; bool realOnDemand = vRecordMp4 ? false : vOnDemand;
if(!realOnDemand){ if(!realOnDemand){
InfoL << "频道保持录像,忽略停止拉流:" << sender.getSchema() << "/" << sender.getVhost() << "/" << sender.getApp() << "/" << sender.getId(); //InfoL << "频道保持录像,忽略停止拉流:" << sender.getSchema() << "/" << sender.getVhost() << "/" << sender.getApp() << "/" << sender.getId();
return; return;
} }
} }

8
src/MediaFile/Mp4Maker.cpp
View File

@ -271,12 +271,17 @@ void Mp4Maker::asyncClose() {
auto recordMp4 = _recordMp4; auto recordMp4 = _recordMp4;
WorkThreadPool::Instance().getExecutor()->async([hMp4,strFileTmp,strFile,strPath,recordMp4,info]() { WorkThreadPool::Instance().getExecutor()->async([hMp4,strFileTmp,strFile,strPath,recordMp4,info]() {
//获取文件录制时间，放在MP4Close之前是为了忽略MP4Close执行时间 //获取文件录制时间，放在MP4Close之前是为了忽略MP4Close执行时间
InfoL << "获取文件录制时间";
const_cast<Mp4Info&>(info).ui64TimeLen = ::time(NULL) - info.ui64StartedTime; const_cast<Mp4Info&>(info).ui64TimeLen = ::time(NULL) - info.ui64StartedTime;
//MP4Close非常耗时，所以要放在后台线程执行 //MP4Close非常耗时，所以要放在后台线程执行
InfoL << "台线程执行MP4Close";
MP4Close(hMp4,MP4_CLOSE_DO_NOT_COMPUTE_BITRATE); MP4Close(hMp4,MP4_CLOSE_DO_NOT_COMPUTE_BITRATE);
InfoL << "临时文件名改成正式文件名，防止mp4未完成时被访问: rename " << strFileTmp.data() << ">" << strFile.data();
//临时文件名改成正式文件名，防止mp4未完成时被访问 //临时文件名改成正式文件名，防止mp4未完成时被访问
rename(strFileTmp.data(),strFile.data()); rename(strFileTmp.data(),strFile.data());
InfoL << "删除过期录像";
//chenxiaolei 删除过期录像 //chenxiaolei 删除过期录像
if(recordMp4){ if(recordMp4){
auto curTimeStr = timeStr("%Y%m%d"); auto curTimeStr = timeStr("%Y%m%d");
@ -319,6 +324,7 @@ void Mp4Maker::asyncClose() {
//chenxiaolei 生成录像文件的信息文件(记录录像时长,开始时间,持续时长等) //chenxiaolei 生成录像文件的信息文件(记录录像时长,开始时间,持续时长等)
InfoL << "生成录像文件的信息文件";
Json::Value infoJson; Json::Value infoJson;
infoJson["startAt"] = timeStr2(info.ui64StartedTime,"%Y%m%d%H%M%S"); infoJson["startAt"] = timeStr2(info.ui64StartedTime,"%Y%m%d%H%M%S");
infoJson["duration"] = (int)(info.ui64TimeLen) ; infoJson["duration"] = (int)(info.ui64TimeLen) ;
@ -330,7 +336,7 @@ void Mp4Maker::asyncClose() {
Json::StyledWriter sw; Json::StyledWriter sw;
os << sw.write(infoJson); os << sw.write(infoJson);
os.close(); os.close();
InfoL << "emitEvent kBroadcastRecordMP4";
/////record 业务逻辑////// /////record 业务逻辑//////
NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastRecordMP4,info); NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastRecordMP4,info);
}); });