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

添加更多录制相关方法

Browse Source
This commit is contained in:
xiongziliang 2020-02-01 22:58:58 +08:00
parent e8ba94ba09
commit 51e0c71007
2 changed files with 80 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/Record/Recorder.cpp
View File

@ -34,67 +34,42 @@ using namespace toolkit;
namespace mediakit { namespace mediakit {
MediaSinkInterface *createHlsRecorder(const string &strVhost_tmp, const string &strApp, const string &strId, const string &customized_path) { string Recorder::getRecordPath(Recorder::type type, const string &vhost, const string &app, const string &stream_id, const string &customized_path) {
#if defined(ENABLE_HLS)
GET_CONFIG(bool, enableVhost, General::kEnableVhost); GET_CONFIG(bool, enableVhost, General::kEnableVhost);
switch (type) {
case Recorder::type_hls: {
GET_CONFIG(string, hlsPath, Hls::kFilePath); GET_CONFIG(string, hlsPath, Hls::kFilePath);
string strVhost = strVhost_tmp;
if (trim(strVhost).empty()) {
//如果strVhost为空，则强制为默认虚拟主机
strVhost = DEFAULT_VHOST;
}
string m3u8FilePath; string m3u8FilePath;
string params;
if (enableVhost) { if (enableVhost) {
m3u8FilePath = strVhost + "/" + strApp + "/" + strId + "/hls.m3u8"; m3u8FilePath = vhost + "/" + app + "/" + stream_id + "/hls.m3u8";
params = string(VHOST_KEY) + "=" + strVhost;
} else { } else {
m3u8FilePath = strApp + "/" + strId + "/hls.m3u8"; m3u8FilePath = app + "/" + stream_id + "/hls.m3u8";
} }
//Here we use the customized file path. //Here we use the customized file path.
if(!customized_path.empty()){ if (!customized_path.empty()) {
m3u8FilePath = customized_path + "/hls.m3u8"; m3u8FilePath = customized_path + "/hls.m3u8";
} }
m3u8FilePath = File::absolutePath(m3u8FilePath, hlsPath); return File::absolutePath(m3u8FilePath, hlsPath);
auto ret = new HlsRecorder(m3u8FilePath, params); }
ret->setMediaSource(strVhost, strApp, strId); case Recorder::type_mp4: {
return ret;
#else
return nullptr;
#endif //defined(ENABLE_HLS)
}
MediaSinkInterface *createMP4Recorder(const string &strVhost_tmp, const string &strApp, const string &strId, const string &customized_path) {
#if defined(ENABLE_MP4RECORD)
GET_CONFIG(bool, enableVhost, General::kEnableVhost);
GET_CONFIG(string, recordPath, Record::kFilePath); GET_CONFIG(string, recordPath, Record::kFilePath);
GET_CONFIG(string, recordAppName, Record::kAppName); GET_CONFIG(string, recordAppName, Record::kAppName);
string strVhost = strVhost_tmp;
if (trim(strVhost).empty()) {
//如果strVhost为空，则强制为默认虚拟主机
strVhost = DEFAULT_VHOST;
}
string mp4FilePath; string mp4FilePath;
if (enableVhost) { if (enableVhost) {
mp4FilePath = strVhost + "/" + recordAppName + "/" + strApp + "/" + strId + "/"; mp4FilePath = vhost + "/" + recordAppName + "/" + app + "/" + stream_id + "/";
} else { } else {
mp4FilePath = recordAppName + "/" + strApp + "/" + strId + "/"; mp4FilePath = recordAppName + "/" + app + "/" + stream_id + "/";
} }
//Here we use the customized file path. //Here we use the customized file path.
if(!customized_path.empty()){ if (!customized_path.empty()) {
mp4FilePath = customized_path + "/"; mp4FilePath = customized_path + "/";
} }
mp4FilePath = File::absolutePath(mp4FilePath, recordPath); return File::absolutePath(mp4FilePath, recordPath);
return new MP4Recorder(mp4FilePath, strVhost, strApp, strId); }
#else default:
return nullptr; return "";
#endif //defined(ENABLE_MP4RECORD) }
} }
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
class RecorderHelper { class RecorderHelper {
@ -215,9 +190,10 @@ public:
return -1; return -1;
} }
auto recorder = MediaSinkInterface::Ptr(createRecorder(vhost, app, stream_id, customized_path)); auto recorder = Recorder::createRecorder(type, vhost, app, stream_id, customized_path);
if (!recorder) { if (!recorder) {
// 创建录制器失败 // 创建录制器失败
WarnL << "不支持该录制类型:" << type;
return -2; return -2;
} }
auto helper = std::make_shared<RecorderHelper>(recorder, continueRecord); auto helper = std::make_shared<RecorderHelper>(recorder, continueRecord);
@ -334,23 +310,6 @@ private:
return vhost + "/" + app + "/" + stream_id; return vhost + "/" + app + "/" + stream_id;
} }
MediaSinkInterface *createRecorder(const string &vhost, const string &app, const string &stream_id, const string &customized_path) {
MediaSinkInterface *ret = nullptr;
switch (type) {
case Recorder::type_hls:
ret = createHlsRecorder(vhost, app, stream_id,customized_path);
break;
case Recorder::type_mp4:
ret = createMP4Recorder(vhost, app, stream_id,customized_path);
break;
default:
break;
}
if(!ret){
WarnL << "can not create recorder of type: " << type;
}
return ret;
}
/** /**
* 有些录制类型不需要track就绪即可录制 * 有些录制类型不需要track就绪即可录制
@ -392,6 +351,29 @@ std::shared_ptr<MediaSinkInterface> Recorder::getRecorder(type type, const strin
return nullptr; return nullptr;
} }
std::shared_ptr<MediaSinkInterface> Recorder::createRecorder(type type, const string &vhost, const string &app, const string &stream_id, const string &customized_path){
auto path = Recorder::getRecordPath(type, vhost, app, stream_id);
switch (type) {
case Recorder::type_hls: {
#if defined(ENABLE_HLS)
auto ret = std::make_shared<HlsRecorder>(path, string(VHOST_KEY) + "=" + vhost);
ret->setMediaSource(vhost, app, stream_id);
return ret;
#endif
return nullptr;
}
case Recorder::type_mp4: {
#if defined(ENABLE_MP4RECORD)
return std::make_shared<MP4Recorder>(path, vhost, app, stream_id);
#endif
return nullptr;
}
default:
return nullptr;
}
}
int Recorder::startRecord(Recorder::type type, const string &vhost, const string &app, const string &stream_id, const string &customized_path, bool waitForRecord, bool continueRecord) { int Recorder::startRecord(Recorder::type type, const string &vhost, const string &app, const string &stream_id, const string &customized_path, bool waitForRecord, bool continueRecord) {
switch (type){ switch (type){

22
src/Record/Recorder.h
View File

@ -53,6 +53,17 @@ public:
type_mp4 = 1 type_mp4 = 1
} type; } type;
/**
* 获取录制文件绝对路径
* @param type hls还是MP4录制
* @param vhost 虚拟主机
* @param app 应用名
* @param stream_id 流id
* @param customized_path 录像文件保存自定义目录，默认为空则自动生成
* @return 录制文件绝对路径
*/
static string getRecordPath(type type, const string &vhost, const string &app, const string &stream_id,const string &customized_path = "");
/** /**
* 获取录制状态 * 获取录制状态
* @param type hls还是MP4录制 * @param type hls还是MP4录制
@ -98,6 +109,17 @@ public:
* @param stream_id 流id * @param stream_id 流id
*/ */
static std::shared_ptr<MediaSinkInterface> getRecorder(type type, const string &vhost, const string &app, const string &stream_id); static std::shared_ptr<MediaSinkInterface> getRecorder(type type, const string &vhost, const string &app, const string &stream_id);
/**
* 创建录制器对象
* @param type hls还是MP4录制
* @param vhost 虚拟主机
* @param app 应用名
* @param stream_id 流id
* @param customized_path 录像文件保存自定义目录，默认为空则自动生成
* @return 对象指针，可能为nullptr
*/
static std::shared_ptr<MediaSinkInterface> createRecorder(type type, const string &vhost, const string &app, const string &stream_id, const string &customized_path);
private: private:
Recorder() = delete; Recorder() = delete;
~Recorder() = delete; ~Recorder() = delete;