Merge 6119ac9c53 into 8ccb4e95b3

更新webassist界面:
1. 增加获取播放器列表
2. 增加推流代理管理
3. 增加拉流代理管理
4. 增加ffmpeg源管理
5. 精简化medialist显示

postman/ZLMediaKit.postman_collection.json

@@ -700,6 +700,58 @@
 			},
 			"response": []
 		},
+		{
+			"name": "获取拉流代理列表(listStreamProxy)",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "{{ZLMediaKit_URL}}/index/api/listStreamProxy?secret={{ZLMediaKit_secret}}",
+					"host": [
+						"{{ZLMediaKit_URL}}"
+					],
+					"path": [
+						"index",
+						"api",
+						"listStreamProxy"
+					],
+					"query": [
+						{
+							"key": "secret",
+							"value": "{{ZLMediaKit_secret}}",
+							"description": "api操作密钥(配置文件配置)"
+						}
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "获取推流代理列表(listStreamPusherProxy)",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "{{ZLMediaKit_URL}}/index/api/listStreamPusherProxy?secret={{ZLMediaKit_secret}}",
+					"host": [
+						"{{ZLMediaKit_URL}}"
+					],
+					"path": [
+						"index",
+						"api",
+						"listStreamPusherProxy"
+					],
+					"query": [
+						{
+							"key": "secret",
+							"value": "{{ZLMediaKit_secret}}",
+							"description": "api操作密钥(配置文件配置)"
+						}
+					]
+				}
+			},
+			"response": []
+		},	
 		{
 			"name": "添加rtsp/rtmp推流(addStreamPusherProxy)",
 			"request": {
@@ -800,6 +852,32 @@
 			},
 			"response": []
 		},
+		{
+			"name": "获取FFmpeg拉流代理列表(listFFmpegSource)",
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "{{ZLMediaKit_URL}}/index/api/listFFmpegSource?secret={{ZLMediaKit_secret}}",
+					"host": [
+						"{{ZLMediaKit_URL}}"
+					],
+					"path": [
+						"index",
+						"api",
+						"listFFmpegSource"
+					],
+					"query": [
+						{
+							"key": "secret",
+							"value": "{{ZLMediaKit_secret}}",
+							"description": "api操作密钥(配置文件配置)"
+						}
+					]
+				}
+			},
+			"response": []
+		},		
 		{
 			"name": "添加FFmpeg拉流代理(addFFmpegSource)",
 			"request": {

server/FFmpegSource.cpp

@@ -103,6 +103,7 @@ void FFmpegSource::play(const string &ffmpeg_cmd_key, const string &src_url, con
     snprintf(cmd, sizeof(cmd), ffmpeg_cmd.data(), File::absolutePath("", ffmpeg_bin).data(), src_url.data(), dst_url.data());
     auto log_file = ffmpeg_log.empty() ? "" : File::absolutePath("", ffmpeg_log);
     _process.run(cmd, log_file);
+    _cmd = cmd;
     InfoL << cmd;
 
     if (is_local_ip(_media_info.host)) {

server/FFmpegSource.h

@@ -77,6 +77,12 @@ public:
      */
     void play(const std::string &ffmpeg_cmd_key, const std::string &src_url, const std::string &dst_url, int timeout_ms, const onPlay &cb);
 
+    const std::string& getSrcUrl() const { return _src_url; }
+    const std::string& getDstUrl() const { return _dst_url; }
+    const std::string& getCmd() const { return _cmd; }
+    const std::string& getCmdKey() const { return _ffmpeg_cmd_key; }
+    const mediakit::MediaInfo& getMediaInfo() const { return _media_info; }
+
     /**
      * 设置录制
      * @param enable_hls 是否开启hls直播或录制
@@ -115,6 +121,7 @@ private:
     std::string _src_url;
     std::string _dst_url;
     std::string _ffmpeg_cmd_key;
+    std::string _cmd;
     std::function<void()> _onClose;
     toolkit::Ticker _replay_ticker;
 };

server/WebApi.cpp

@@ -346,6 +346,15 @@ public:
         return it->second;
     }
 
+    void for_each(const std::function<void(const std::string&, const Pointer&)>& cb) {
+        std::lock_guard<std::recursive_mutex> lck(_mtx);
+        auto it = _map.begin();
+        while (it != _map.end()) {
+            cb(it->first, it->second);
+            it++;
+        }
+    }
+
     template<class ..._Args>
     Pointer make(const std::string &key, _Args&& ...__args) {
         // assert(!find(key));
@@ -409,6 +418,29 @@ void dumpMediaTuple(const MediaTuple &tuple, Json::Value& item) {
     item["params"] = tuple.params;
 }
 
+Value ToJson(const PusherProxy::Ptr& p) {
+    Value item;
+    item["url"] = p->getUrl();
+    item["status"] = p->getStatus();
+    item["liveSecs"] = p->getLiveSecs();
+    item["rePublishCount"] = p->getRePublishCount();
+    if (auto src = p->getSrc()) {
+        dumpMediaTuple(src->getMediaTuple(), item["src"]);
+    }
+    return item;
+}
+
+Value ToJson(const PlayerProxy::Ptr& p) {
+    Value item;
+    item["url"] = p->getUrl();
+    item["status"] = p->getStatus();
+    item["liveSecs"] = p->getLiveSecs();
+    item["rePullCount"] = p->getRePullCount();
+    item["totalReaderCount"] = p->totalReaderCount();
+    dumpMediaTuple(p->getMediaTuple(), item["src"]);
+    return item;
+}
+
 Value makeMediaSourceJson(MediaSource &media){
     Value item;
     item["schema"] = media.getSchema();
@@ -1173,7 +1205,22 @@ void installWebApi() {
         CHECK_ARGS("key");
         val["data"]["flag"] = s_pusher_proxy.erase(allArgs["key"]) == 1;
     });
-
+    api_regist("/index/api/listStreamPusherProxy", [](API_ARGS_MAP) {
+        CHECK_SECRET();
+        s_pusher_proxy.for_each([&val](const std::string& key, const PusherProxy::Ptr& p) {
+            Json::Value item = ToJson(p);
+            item["key"] = key;
+            val["data"].append(item);
+        });
+    });
+    api_regist("/index/api/listStreamProxy", [](API_ARGS_MAP) {
+        CHECK_SECRET();
+        s_player_proxy.for_each([&val](const std::string& key, const PlayerProxy::Ptr& p) {
+            Json::Value item = ToJson(p);
+            item["key"] = key;
+            val["data"].append(item);
+        });
+    });
     // 动态添加rtsp/rtmp拉流代理  [AUTO-TRANSLATED:2616537c]
     // Dynamically add rtsp/rtmp pull stream proxy
     // 测试url http://127.0.0.1/index/api/addStreamProxy?vhost=__defaultVhost__&app=proxy&enable_rtsp=1&enable_rtmp=1&stream=0&url=rtmp://127.0.0.1/live/obs  [AUTO-TRANSLATED:71ddce15]
@@ -1286,7 +1333,18 @@ void installWebApi() {
         CHECK_ARGS("key");
         val["data"]["flag"] = s_ffmpeg_src.erase(allArgs["key"]) == 1;
     });
-
+    api_regist("/index/api/listFFmpegSource", [](API_ARGS_MAP) {
+        CHECK_SECRET();
+        s_ffmpeg_src.for_each([&val](const std::string& key, const FFmpegSource::Ptr& src) {
+            Json::Value item;
+            item["src_url"] = src->getSrcUrl();
+            item["dst_url"] = src->getDstUrl();
+            item["cmd"] = src->getCmd();
+            item["ffmpeg_cmd_key"] = src->getCmdKey();
+            item["key"] = key;
+            val["data"].append(item);
+        });
+    });
     // 新增http api下载可执行程序文件接口  [AUTO-TRANSLATED:d6e44e84]
     // Add a new http api to download executable files
     // 测试url http://127.0.0.1/index/api/downloadBin  [AUTO-TRANSLATED:9525e834]
@@ -1477,7 +1535,11 @@ void installWebApi() {
             obj["vhost"] = vec[0];
             obj["app"] = vec[1];
             obj["stream_id"] = vec[2];
-            obj["port"] = pr.second->getPort();
+            auto& rtps = pr.second;
+            obj["port"] = rtps->getPort();
+            obj["ssrc"] = rtps->getSSRC();
+            obj["tcp_mode"] = rtps->getTcpMode();
+            obj["only_track"] = rtps->getOnlyTrack();
             val["data"].append(obj);
         }
     });
@@ -1741,9 +1803,7 @@ void installWebApi() {
             throw ApiRetException("can not find pusher", API::NotFound);
         }
 
-        val["data"]["status"] = pusher->getStatus();
-        val["data"]["liveSecs"] = pusher->getLiveSecs();
-        val["data"]["rePublishCount"] = pusher->getRePublishCount();
+        val["data"] = ToJson(pusher);
         invoker(200, headerOut, val.toStyledString());
     });
 
@@ -1755,9 +1815,7 @@ void installWebApi() {
             throw ApiRetException("can not find the proxy", API::NotFound);
         }
 
-        val["data"]["status"] = proxy->getStatus();
-        val["data"]["liveSecs"] = proxy->getLiveSecs();
-        val["data"]["rePullCount"] = proxy->getRePullCount();
+        val["data"] = ToJson(proxy);
         invoker(200, headerOut, val.toStyledString());
     });
 

src/Player/PlayerProxy.h

@@ -139,6 +139,10 @@ public:
     // Using this only makes sense after a successful connection to the server
     TranslationInfo getTranslationInfo();
 
+    const std::string& getUrl() const { return _pull_url; }
+    const MediaTuple& getMediaTuple() const { return _tuple; }
+    const ProtocolOption& getOption() const { return _option; }
+
 private:
     // MediaSourceEvent override
     bool close(MediaSource &sender) override;

src/Pusher/MediaPusher.cpp

@@ -46,6 +46,7 @@ void MediaPusher::publish(const string &url) {
     _delegate->setOnPublished(_on_publish);
     _delegate->mINI::operator=(*this);
     _delegate->publish(url);
+    _url = url;
 }
 
 EventPoller::Ptr MediaPusher::getPoller(){

src/Pusher/MediaPusher.h

@@ -33,11 +33,13 @@ public:
     void publish(const std::string &url) override;
     toolkit::EventPoller::Ptr getPoller();
     void setOnCreateSocket(toolkit::Socket::onCreateSocket cb);
-
+    std::shared_ptr<MediaSource> getSrc() { return _src.lock(); }
+    const std::string& getUrl() const { return _url; }
 private:
     std::weak_ptr<MediaSource> _src;
     toolkit::EventPoller::Ptr _poller;
     toolkit::Socket::onCreateSocket _on_create_socket;
+    std::string _url;
 };
 
 } /* namespace mediakit */

src/Pusher/PusherProxy.cpp

@@ -19,7 +19,6 @@ PusherProxy::PusherProxy(const MediaSource::Ptr &src, int retry_count, const Eve
     : MediaPusher(src, poller) {
     _retry_count = retry_count;
     _on_close = [](const SockException &) {};
-    _weak_src = src;
     _live_secs = 0;
     _live_status = 1;
     _republish_count = 0;
@@ -52,7 +51,7 @@ void PusherProxy::publish(const string &dst_url) {
             strong_self->_on_publish = nullptr;
         }
 
-        auto src = strong_self->_weak_src.lock();
+        auto src = strong_self->getSrc();
         if (!err) {
             // 推流成功  [AUTO-TRANSLATED:28ce6e56]
             // Stream successfully pushed
@@ -87,7 +86,7 @@ void PusherProxy::publish(const string &dst_url) {
             TraceL << " live secs " << strong_self->_live_secs;
         }
 
-        auto src = strong_self->_weak_src.lock();
+        auto src = strong_self->getSrc();
         // 推流异常中断，延时重试播放  [AUTO-TRANSLATED:e69e5a05]
         // Stream abnormally interrupted, retry playing with delay
         if (src && (*failed_cnt < strong_self->_retry_count || strong_self->_retry_count < 0)) {

src/Pusher/PusherProxy.h

@@ -77,7 +77,6 @@ private:
     std::atomic<int> _live_status;
     std::atomic<uint64_t> _live_secs;
     std::atomic<uint64_t> _republish_count;
-    std::weak_ptr<MediaSource> _weak_src;
     std::function<void(const toolkit::SockException &ex)> _on_close;
     std::function<void(const toolkit::SockException &ex)> _on_publish;
 };

src/Record/MP4Recorder.cpp

@@ -126,7 +126,7 @@ bool MP4Recorder::inputFrame(const Frame::Ptr &frame) {
         if (_last_dts == 0 || _last_dts > frame->dts()) {
             // b帧情况下dts时间戳可能回退  [AUTO-TRANSLATED:1de38f77]
             // In the case of b-frames, the dts timestamp may regress
-            _last_dts = MAX(frame->dts(), _last_dts);
+            _last_dts = MIN(frame->dts(), _last_dts);
         }
         auto duration = 5u; // 默认至少一帧5ms
         if (frame->dts() > 0 && frame->dts() > _last_dts) {

src/Rtp/RtpServer.cpp

@@ -295,5 +295,15 @@ void RtpServer::updateSSRC(uint32_t ssrc) {
     }
 }
 
+uint32_t RtpServer::getSSRC() const {
+    if (_ssrc) {
+        return *_ssrc;
+    }
+    if (_tcp_server) {
+        return (*_tcp_server)[RtpSession::kSSRC];
+    }
+    return 0;
+}
+
 }//namespace mediakit
 #endif//defined(ENABLE_RTPPROXY)

src/Rtp/RtpServer.h

@@ -97,6 +97,9 @@ public:
      */
     void updateSSRC(uint32_t ssrc);
 
+    uint32_t getSSRC() const;
+    int getOnlyTrack() const { return _only_track; }
+    TcpMode getTcpMode() const { return _tcp_mode; }
 private:
     // tcp主动模式连接服务器成功回调  [AUTO-TRANSLATED:0775844e]
     // tcp active mode connection server success callback

www/webassist

@@ -1 +1 @@
-Subproject commit b02d2a4c1abf95db45e50bb77d789defa0fcc4b7
+Subproject commit 353af1f60115767e57662107e30935ac6ef178a2