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

完善stopRecord接口

Browse Source
This commit is contained in:
xiongziliang 2019-12-05 14:31:44 +08:00
parent 055c312579
commit 10dc254510
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/WebApi.cpp
View File

@ -709,10 +709,11 @@ void installWebApi() {
API_REGIST(api,stopRecord,{
CHECK_SECRET();
CHECK_ARGS("type","vhost","app","stream");
Recorder::stopRecord((Recorder::type)allArgs["type"].as<int>(),
allArgs["vhost"],
allArgs["app"],
allArgs["stream"]);
int result = Recorder::stopRecord((Recorder::type)allArgs["type"].as<int>(),
allArgs["vhost"],
allArgs["app"],
allArgs["stream"]);
val["result"] = result;
});
// 获取hls或MP4录制状态

7
src/Record/Recorder.cpp
View File

@ -205,9 +205,9 @@ public:
return 0;
}
void stopRecord(const string &vhost, const string &app, const string &stream_id) {
bool stopRecord(const string &vhost, const string &app, const string &stream_id) {
lock_guard<decltype(_recorder_mtx)> lck(_recorder_mtx);
_recorder_map.erase(getRecorderKey(vhost, app, stream_id));
return _recorder_map.erase(getRecorderKey(vhost, app, stream_id));
}
void stopAll(){
@ -345,13 +345,14 @@ int Recorder::startRecord(Recorder::type type, const string &vhost, const string
return -3;
}
void Recorder::stopRecord(Recorder::type type, const string &vhost, const string &app, const string &stream_id) {
bool Recorder::stopRecord(Recorder::type type, const string &vhost, const string &app, const string &stream_id) {
switch (type){
case type_mp4:
return MediaSourceWatcher<type_mp4>::Instance().stopRecord(vhost,app,stream_id);
case type_hls:
return MediaSourceWatcher<type_hls>::Instance().stopRecord(vhost,app,stream_id);
}
return false;
}
void Recorder::stopAll() {

2
src/Record/Recorder.h
View File

@ -82,7 +82,7 @@ public:
* @param app 应用名
* @param stream_id 流id
*/
static void stopRecord(type type, const string &vhost, const string &app, const string &stream_id);
static bool stopRecord(type type, const string &vhost, const string &app, const string &stream_id);
/**
* 停止所有录制，一般程序退出时调用