aunix/ZLMediaKit
1
0
Fork 0
mirror of https://gitee.com/xia-chu/ZLMediaKit.git synced 2026-05-24 02:27:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: aunix:41bdfa0755d3c7eef6fffc2577b501226fde7cd2
Branches Tags
aunix:master
aunix:feature/transcode2
aunix:copilot/reliable-udp-projects
aunix:8.0
aunix:feature/async_write_file
aunix:feature/dynamic_library
aunix:7.0
aunix:feature/log_context
aunix:feature/transcode
aunix:feature/hls_record_disk
aunix:6.0
aunix:5.0
aunix:4.0
aunix:3.0
aunix:2.0
aunix:1.0
..
compare: aunix:dfca520857fdc67c431bf811c14d174b123a88a6
Branches Tags
aunix:master
aunix:feature/transcode2
aunix:copilot/reliable-udp-projects
aunix:8.0
aunix:feature/async_write_file
aunix:feature/dynamic_library
aunix:7.0
aunix:feature/log_context
aunix:feature/transcode
aunix:feature/hls_record_disk
aunix:6.0
aunix:5.0
aunix:4.0
aunix:3.0
aunix:2.0
aunix:1.0

No commits in common. "41bdfa0755d3c7eef6fffc2577b501226fde7cd2" and "dfca520857fdc67c431bf811c14d174b123a88a6" have entirely different histories.
41bdfa0755 ... dfca520857

4 changed files with 39 additions and 43 deletions
Show Stats Expand all files Collapse all files

2
cmake/checks/atomic_check.cpp
View File

@ -1,4 +1,4 @@
#include <atomic> #include <atomic>
static int test() static int test()
{ {

4
resource.rc
View File

@ -1,5 +1,5 @@
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#error "This file is not editable by Visual C++." #error This file is not editable by Visual C++.
#endif //APSTUDIO_INVOKED #endif //APSTUDIO_INVOKED
#include "winres.h" #include "winres.h"

74
server/WebApi.cpp
View File

@ -1191,27 +1191,25 @@ void installWebApi() {
auto dst_url = allArgs["dst_url"]; auto dst_url = allArgs["dst_url"];
auto retry_count = allArgs["retry_count"].empty() ? -1 : allArgs["retry_count"].as<int>(); auto retry_count = allArgs["retry_count"].empty() ? -1 : allArgs["retry_count"].as<int>();
EventPollerPool::Instance().getPoller(false)->async([=](){ addStreamPusherProxy(allArgs["schema"],
addStreamPusherProxy(allArgs["schema"], allArgs["vhost"],
allArgs["vhost"], allArgs["app"],
allArgs["app"], allArgs["stream"],
allArgs["stream"], allArgs["dst_url"],
allArgs["dst_url"], retry_count,
retry_count, allArgs["rtp_type"],
allArgs["rtp_type"], allArgs["timeout_sec"],
allArgs["timeout_sec"], args,
args, [invoker, val, headerOut, dst_url](const SockException &ex, const string &key) mutable {
[invoker, val, headerOut, dst_url](const SockException &ex, const string &key) mutable { if (ex) {
if (ex) { val["code"] = API::OtherFailed;
val["code"] = API::OtherFailed; val["msg"] = ex.what();
val["msg"] = ex.what(); } else {
} else { val["data"]["key"] = key;
val["data"]["key"] = key; InfoL << "Publish success, please play with player:" << dst_url;
InfoL << "Publish success, please play with player:" << dst_url; }
} invoker(200, headerOut, val.toStyledString());
invoker(200, headerOut, val.toStyledString()); });
});
});
}); });
// 关闭推流代理 [AUTO-TRANSLATED:91602b75] // 关闭推流代理 [AUTO-TRANSLATED:91602b75]
@ -1260,24 +1258,22 @@ void installWebApi() {
vhost = allArgs["vhost"]; vhost = allArgs["vhost"];
} }
auto tuple = MediaTuple { vhost, allArgs["app"], allArgs["stream"], "" }; auto tuple = MediaTuple { vhost, allArgs["app"], allArgs["stream"], "" };
EventPollerPool::Instance().getPoller(false)->async([=]() { addStreamProxy(tuple,
addStreamProxy(tuple, allArgs["url"],
allArgs["url"], retry_count,
retry_count, option,
option, allArgs["rtp_type"],
allArgs["rtp_type"], allArgs["timeout_sec"],
allArgs["timeout_sec"], args,
args, [invoker,val,headerOut](const SockException &ex,const string &key) mutable{
[invoker,val,headerOut](const SockException &ex,const string &key) mutable{ if (ex) {
if (ex) { val["code"] = API::OtherFailed;
val["code"] = API::OtherFailed; val["msg"] = ex.what();
val["msg"] = ex.what(); } else {
} else { val["data"]["key"] = key;
val["data"]["key"] = key; }
} invoker(200, headerOut, val.toStyledString());
invoker(200, headerOut, val.toStyledString()); });
});
});
}); });
// 关闭拉流代理 [AUTO-TRANSLATED:5204f128] // 关闭拉流代理 [AUTO-TRANSLATED:5204f128]

2
src/Extension/Track.cpp
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved. * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
* *
* This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit). * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).