amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 10:40:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

简化代码

Browse Source
This commit is contained in:
xiongziliang 2019-10-18 10:02:42 +08:00
parent 0f5582689b
commit 0aa28b2848
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpart/ZLToolKit

@ -1 +1 @@
Subproject commit ace77b132039d6ef8a97b6dad92115f88821bc45 Subproject commit 1f99a1679dd9136edc3e3b64edcc2c74ad7bd259

2
server/FFmpegSource.cpp
View File

@ -64,7 +64,7 @@ void FFmpegSource::play(const string &src_url,const string &dst_url,int timeout_
char cmd[1024] = {0}; char cmd[1024] = {0};
snprintf(cmd, sizeof(cmd),ffmpeg_cmd.data(),ffmpeg_bin.data(),src_url.data(),dst_url.data()); snprintf(cmd, sizeof(cmd),ffmpeg_cmd.data(),ffmpeg_bin.data(),src_url.data(),dst_url.data());
_process.run(cmd,File::absolutePath("",false,ffmpeg_log)); _process.run(cmd,File::absolutePath("",ffmpeg_log));
InfoL << cmd; InfoL << cmd;
if(_media_info._host == "127.0.0.1"){ if(_media_info._host == "127.0.0.1"){

2
src/Http/HttpSession.cpp
View File

@ -504,7 +504,7 @@ void HttpSession::Handle_Req_GET(int64_t &content_len) {
GET_CONFIG(uint32_t,reqCnt,Http::kMaxReqCount); GET_CONFIG(uint32_t,reqCnt,Http::kMaxReqCount);
GET_CONFIG(bool,enableVhost,General::kEnableVhost); GET_CONFIG(bool,enableVhost,General::kEnableVhost);
GET_CONFIG(string,rootPath,Http::kRootPath); GET_CONFIG(string,rootPath,Http::kRootPath);
auto strFile = File::absolutePath(enableVhost ? _mediaInfo._vhost + _parser.Url() : _parser.Url(), false, rootPath); auto strFile = File::absolutePath(enableVhost ? _mediaInfo._vhost + _parser.Url() : _parser.Url(),rootPath);
bool bClose = (strcasecmp(_parser["Connection"].data(),"close") == 0) || ( ++_iReqCnt > reqCnt); bool bClose = (strcasecmp(_parser["Connection"].data(),"close") == 0) || ( ++_iReqCnt > reqCnt);
do{ do{

2
src/MediaFile/MediaReader.cpp
View File

@ -48,7 +48,7 @@ MediaReader::MediaReader(const string &strVhost,const string &strApp, const stri
}else{ }else{
strFileName = strApp + "/" + strId; strFileName = strApp + "/" + strId;
} }
strFileName = File::absolutePath(strFileName, false,recordPath); strFileName = File::absolutePath(strFileName,recordPath);
} }
_hMP4File = MP4Read(strFileName.data()); _hMP4File = MP4Read(strFileName.data());

4
src/MediaFile/MediaRecorder.cpp
View File

@ -63,7 +63,7 @@ MediaRecorder::MediaRecorder(const string &strVhost_tmp,
}else{ }else{
m3u8FilePath = strApp + "/" + strId + "/hls.m3u8"; m3u8FilePath = strApp + "/" + strId + "/hls.m3u8";
} }
m3u8FilePath = File::absolutePath(m3u8FilePath,false,hlsPath); m3u8FilePath = File::absolutePath(m3u8FilePath,hlsPath);
_hlsRecorder.reset(new HlsRecorder(m3u8FilePath,params,hlsBufSize, hlsDuration, hlsNum)); _hlsRecorder.reset(new HlsRecorder(m3u8FilePath,params,hlsBufSize, hlsDuration, hlsNum));
} }
#endif //defined(ENABLE_HLS) #endif //defined(ENABLE_HLS)
@ -79,7 +79,7 @@ MediaRecorder::MediaRecorder(const string &strVhost_tmp,
} else { } else {
mp4FilePath = recordAppName + "/" + strApp + "/" + strId + "/"; mp4FilePath = recordAppName + "/" + strApp + "/" + strId + "/";
} }
mp4FilePath = File::absolutePath(mp4FilePath,false,recordPath); mp4FilePath = File::absolutePath(mp4FilePath,recordPath);
_mp4Recorder.reset(new MP4Recorder(mp4FilePath,strVhost,strApp,strId)); _mp4Recorder.reset(new MP4Recorder(mp4FilePath,strVhost,strApp,strId));
} }
#endif //defined(ENABLE_MP4RECORD) #endif //defined(ENABLE_MP4RECORD)