Merge branch 'master' into dev

3rdpart/ZLToolKit

@@ -1 +1 @@
-Subproject commit 04d1c47d2568f5ce1ff84260cefaf2754e514a5e
+Subproject commit 26d54bbc7b1860a450434dce49bbc8fcbcbae88b

CMakeLists.txt

@@ -204,7 +204,7 @@ elseif(WIN32)
   if (MSVC)
     set(COMPILE_OPTIONS_DEFAULT
             # TODO: /wd4819 应该是不会生效
-            "/wd4566;/wd4819"
+            "/wd4566;/wd4819;/utf-8"
             # warning C4530: C++ exception handler used, but unwind semantics are not enabled.
             "/EHsc")
     # disable Windows logo

conf/config.ini

@@ -219,7 +219,7 @@ timeout_sec=15
 retry_count=3
 
 [http]
-#http服务器字符编码，windows上默认gb2312
+#http服务器字符编码集
 charSet=utf-8
 #http链接超时时间
 keepAliveSecond=30

postman/ZLMediaKit.postman_collection.json

@@ -2044,6 +2044,47 @@
 			},
 			"response": []
 		},
+		{
+			"name": "获取rtp发送列表(listRtpSender)",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "{{ZLMediaKit_URL}}/index/api/listRtpSender?secret={{ZLMediaKit_secret}}&vhost={{defaultVhost}}&app=live&stream=test",
+					"host": [
+						"{{ZLMediaKit_URL}}"
+					],
+					"path": [
+						"index",
+						"api",
+						"listRtpSender"
+					],
+					"query": [
+						{
+							"key": "secret",
+							"value": "{{ZLMediaKit_secret}}",
+							"description": "api操作密钥(配置文件配置)"
+						},
+						{
+							"key": "vhost",
+							"value": "{{defaultVhost}}",
+							"description": "虚拟主机，例如__defaultVhost__"
+						},
+						{
+							"key": "app",
+							"value": "live",
+							"description": "应用名，例如 live"
+						},
+						{
+							"key": "stream",
+							"value": "test",
+							"description": "流id，例如 obs"
+						}
+					]
+				}
+			},
+			"response": []
+		},
 		{
 			"name": "获取版本信息(version)",
 			"request": {

server/WebApi.cpp

@@ -208,7 +208,7 @@ static ApiArgsType getAllArgs(const Parser &parser) {
     if (parser["Content-Type"].find("application/x-www-form-urlencoded") == 0) {
         auto contentArgs = parser.parseArgs(parser.content());
         for (auto &pr : contentArgs) {
-            allArgs[pr.first] = HttpSession::urlDecodeComponent(pr.second);
+            allArgs[pr.first] = strCoding::UrlDecodeComponent(pr.second);
         }
     } else if (parser["Content-Type"].find("application/json") == 0) {
         try {
@@ -1347,6 +1347,26 @@ void installWebApi() {
         });
     });
 
+    api_regist("/index/api/listRtpSender",[](API_ARGS_MAP_ASYNC){
+        CHECK_SECRET();
+        CHECK_ARGS("vhost", "app", "stream");
+
+        auto src = MediaSource::find(allArgs["vhost"], allArgs["app"], allArgs["stream"]);
+        if (!src) {
+            throw ApiRetException("can not find the source stream", API::NotFound);
+        }
+
+        auto muxer = src->getMuxer();
+        CHECK(muxer, "get muxer from media source failed");
+
+        src->getOwnerPoller()->async([=]() mutable {
+            muxer->forEachRtpSender([&](const std::string &ssrc) mutable {
+                val["data"].append(ssrc);
+            });
+            invoker(200, headerOut, val.toStyledString());
+        });
+    });
+
     api_regist("/index/api/startSendRtpPassive",[](API_ARGS_MAP_ASYNC){
         CHECK_SECRET();
         CHECK_ARGS("vhost", "app", "stream", "ssrc");

src/Common/MultiMediaSourceMuxer.cpp

@@ -173,6 +173,12 @@ std::string MultiMediaSourceMuxer::shortUrl() const {
     return _tuple.shortUrl();
 }
 
+void MultiMediaSourceMuxer::forEachRtpSender(const std::function<void(const std::string &ssrc)> &cb) const {
+    for (auto &pr : _rtp_sender) {
+        cb(pr.first);
+    }
+}
+
 MultiMediaSourceMuxer::MultiMediaSourceMuxer(const MediaTuple& tuple, float dur_sec, const ProtocolOption &option): _tuple(tuple) {
     if (!option.stream_replace.empty()) {
         // 支持在on_publish hook中替换stream_id

src/Common/MultiMediaSourceMuxer.h

@@ -138,6 +138,8 @@ public:
     const MediaTuple &getMediaTuple() const;
     std::string shortUrl() const;
 
+    void forEachRtpSender(const std::function<void(const std::string &ssrc)> &cb) const;
+
 protected:
     /////////////////////////////////MediaSink override/////////////////////////////////
 

src/Common/config.cpp

@@ -181,12 +181,7 @@ static onceToken token([]() {
     mINI::Instance()[kKeepAliveSecond] = 15;
     mINI::Instance()[kDirMenu] = true;
     mINI::Instance()[kVirtualPath] = "";
-
-#if defined(_WIN32)
-    mINI::Instance()[kCharSet] = "gb2312";
-#else
     mINI::Instance()[kCharSet] = "utf-8";
-#endif
 
     mINI::Instance()[kRootPath] = "./www";
     mINI::Instance()[kNotFound] = StrPrinter << "<html>"

src/Http/HttpClient.cpp

@@ -66,7 +66,8 @@ void HttpClient::sendRequest(const string &url) {
     _http_persistent = true;
     if (_body && _body->remainSize()) {
         _header.emplace("Content-Length", to_string(_body->remainSize()));
-        _header.emplace("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+        GET_CONFIG(string, charSet, Http::kCharSet);
+        _header.emplace("Content-Type", "application/x-www-form-urlencoded; charset=" + charSet);
     }
 
     bool host_changed = (_last_host != host + ":" + to_string(port)) || (_is_https != is_https);

src/Http/HttpSession.cpp

@@ -683,34 +683,10 @@ void HttpSession::sendResponse(int code,
     AsyncSender::onSocketFlushed(data);
 }
 
-string HttpSession::urlDecodePath(const string &str) {
-    auto ret = strCoding::UrlDecodePath(str);
-#ifdef _WIN32
-    GET_CONFIG(string, charSet, Http::kCharSet);
-    bool isGb2312 = !strcasecmp(charSet.data(), "gb2312");
-    if (isGb2312) {
-        ret = strCoding::UTF8ToGB2312(ret);
-    }
-#endif // _WIN32
-    return ret;
-}
-
-string HttpSession::urlDecodeComponent(const string &str) {
-    auto ret = strCoding::UrlDecodeComponent(str);
-#ifdef _WIN32
-    GET_CONFIG(string, charSet, Http::kCharSet);
-    bool isGb2312 = !strcasecmp(charSet.data(), "gb2312");
-    if (isGb2312) {
-        ret = strCoding::UTF8ToGB2312(ret);
-    }
-#endif // _WIN32
-    return ret;
-}
-
 void HttpSession::urlDecode(Parser &parser) {
-    parser.setUrl(urlDecodePath(parser.url()));
+    parser.setUrl(strCoding::UrlDecodePath(parser.url()));
     for (auto &pr : _parser.getUrlArgs()) {
-        const_cast<string &>(pr.second) = urlDecodeComponent(pr.second);
+        const_cast<string &>(pr.second) = strCoding::UrlDecodeComponent(pr.second);
     }
 }
 

src/Http/HttpSession.h

@@ -44,8 +44,6 @@ public:
     void onRecv(const toolkit::Buffer::Ptr &) override;
     void onError(const toolkit::SockException &err) override;
     void onManager() override;
-    static std::string urlDecodePath(const std::string &str);
-    static std::string urlDecodeComponent(const std::string &str);
     void setTimeoutSec(size_t second);
     void setMaxReqSize(size_t max_req_size);
 

src/Record/HlsMaker.cpp

@@ -28,7 +28,7 @@ void HlsMaker::makeIndexFile(bool include_delay, bool eof) {
     GET_CONFIG(uint32_t, segDelay, Hls::kSegmentDelay);
     GET_CONFIG(uint32_t, segRetain, Hls::kSegmentRetain);
     std::deque<std::tuple<int, std::string>> temp(_seg_dur_list);
-    if (!include_delay) {
+    if (!include_delay && _seg_number) {
         while (temp.size() > _seg_number) {
             temp.pop_front();
         }

webrtc/RtpExt.cpp

@@ -204,7 +204,8 @@ static unordered_map<string/*ext*/, RtpExtType/*id*/> s_url_to_type = {RTP_EXT_M
 RtpExtType RtpExt::getExtType(const string &url) {
     auto it = s_url_to_type.find(url);
     if (it == s_url_to_type.end()) {
-        throw std::invalid_argument(string("未识别的rtp ext url类型:") + url);
+        WarnL << "unknown rtp ext url type: " << url;
+        return RtpExtType::padding;
     }
     return it->second;
 }