Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-18 06:02:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge upstream

Browse Source
This commit is contained in:
monktan
2020-10-25 17:48:37 +08:00
parent e95ed256ea 5c7a08eb7c
commit a1fe5ee817
45 changed files with 743 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/WebApi.cpp
View File

@@ -504,12 +504,12 @@ void installWebApi() {
allArgs["vhost"],
allArgs["app"],
allArgs["stream"]);
if(src){
if (src) {
bool flag = src->close(allArgs["force"].as<bool>());
val["result"] = flag ? 0 : -1;
val["msg"] = flag ? "success" : "close failed";
val["code"] = API::OtherFailed;
}else{
val["code"] = flag ? API::Success : API::OtherFailed;
} else {
val["result"] = -2;
val["msg"] = "can not find the stream";
val["code"] = API::OtherFailed;
@@ -1309,6 +1309,8 @@ void installWebApi() {
}
void unInstallWebApi(){
RtpSelector::Instance().clear();
{
lock_guard<recursive_mutex> lck(s_proxyMapMtx);
s_proxyMap.clear();
@@ -1318,6 +1320,7 @@ void unInstallWebApi(){
lock_guard<recursive_mutex> lck(s_ffmpegMapMtx);
s_ffmpegMap.clear();
}
{
#if defined(ENABLE_RTPPROXY)
lock_guard<recursive_mutex> lck(s_rtpServerMapMtx);