amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-10-31 08:39:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化虚拟主机相关

Browse Source
This commit is contained in:
xiongziliang 2019-05-29 09:24:02 +08:00
parent a603d7f1c3
commit c1b6df7bc7
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Common/MediaSource.cpp
View File

@ -239,6 +239,11 @@ void MediaInfo::parse(const string &url){
_vhost = DEFAULT_VHOST; _vhost = DEFAULT_VHOST;
} }
} }
if(_vhost == "localhost"){
_vhost = DEFAULT_VHOST;
}
GET_CONFIG(bool,enableVhost,General::kEnableVhost); GET_CONFIG(bool,enableVhost,General::kEnableVhost);
if(!enableVhost){ if(!enableVhost){
_vhost = DEFAULT_VHOST; _vhost = DEFAULT_VHOST;

20
src/MediaFile/Mp4Maker.cpp
View File

@ -155,22 +155,12 @@ void Mp4Maker::createFile() {
_info.strFilePath = strFile; _info.strFilePath = strFile;
GET_CONFIG(string,appName,Record::kAppName); GET_CONFIG(string,appName,Record::kAppName);
GET_CONFIG(bool,enableVhost,General::kEnableVhost);
if(enableVhost){ _info.strUrl = appName + "/"
_info.strUrl = _info.strVhost + "/" + _info.strAppName + "/"
+ appName + "/" + _info.strStreamId + "/"
+ _info.strAppName + "/" + strDate + "/"
+ _info.strStreamId + "/" + strTime + ".mp4";
+ strDate + "/"
+ strTime + ".mp4";
}else{
_info.strUrl = appName + "/"
+ _info.strAppName + "/"
+ _info.strStreamId + "/"
+ strDate + "/"
+ strTime + ".mp4";
}
//----record 业务逻辑----// //----record 业务逻辑----//