Add srt caller mode and stream encryption support. (ZLMediaKit#4088)

Add srt caller mode and stream encryption support.
1. Support srt caller mode, realize srt proxy pull stream proxy push
stream;
url parameter format such as: srt://127.0.0.1:9000?streamid=#!
::r=live/test11
2. Support srt stream encrypted transmission in caller and listener
mode.

---------

Co-authored-by: xiongguangjie <xiong_panda@163.com>

Author: baigao-X

CMakeLists.txt

@@ -463,6 +463,10 @@ if(ENABLE_VIDEOSTACK)
   endif ()
 endif ()
 
+if(ENABLE_SRT)
+  update_cached_list(MK_COMPILE_DEFINITIONS ENABLE_SRT)
+endif()
+
 # ----------------------------------------------------------------------------
 # Solution folders:
 # ----------------------------------------------------------------------------

conf/config.ini

@@ -400,6 +400,8 @@ port=9000
 latencyMul=4
 #包缓存的大小
 pktBufSize=8192
+#srt udp服务器的密码,为空表示不加密
+passPhrase=
 
 
 [rtsp]

postman/ZLMediaKit.postman_collection.json

@@ -522,7 +522,7 @@
 			"response": []
 		},
 		{
-			"name": "添加rtsp/rtmp/hls拉流代理(addStreamProxy)",
+			"name": "添加rtsp/rtmp/hls/srt拉流代理(addStreamProxy)",
 			"request": {
 				"method": "GET",
 				"header": [],
@@ -663,7 +663,19 @@
 							"value": null,
 							"description": "无人观看时，是否直接关闭(而不是通过on_none_reader hook返回close)",
 							"disabled": true
-						}
+						},
+						{
+							"key": "latency",
+							"value": null,
+							"description": "srt延时, 单位毫秒",
+							"disabled": true
+						},
+						{
+							"key": "passphrase",
+							"value": null,
+							"description": "srt拉流的密码",
+							"disabled": true
+                        }
 					]
 				}
 			},
@@ -753,7 +765,7 @@
 			"response": []
 		},	
 		{
-			"name": "添加rtsp/rtmp推流(addStreamPusherProxy)",
+			"name": "添加rtsp/rtmp/srt推流(addStreamPusherProxy)",
 			"request": {
 				"method": "GET",
 				"header": [],
@@ -815,7 +827,20 @@
 							"value": null,
 							"description": "推流重试次数,不传此参数或传值<=0时，则无限重试",
 							"disabled": true
-						}
+						},
+                        {
+							"key": "latency",
+							"value": null,
+							"description": "srt延时, 单位毫秒",
+							"disabled": true
+						},
+						{
+							"key": "passphrase",
+							"value": null,
+							"description": "srt推流的密码",
+							"disabled": true
+                        }
+
 					]
 				}
 			},
@@ -2610,4 +2635,4 @@
 			"value": "__defaultVhost__"
 		}
 	]
-}
+}

server/WebApi.cpp

@@ -685,6 +685,7 @@ void addStreamPusherProxy(const string &schema,
                           int retry_count,
                           int rtp_type,
                           float timeout_sec,
+                          const mINI &args,
                           const function<void(const SockException &ex, const string &key)> &cb) {
     auto key = getPusherKey(schema, vhost, app, stream, url);
     auto src = MediaSource::find(schema, vhost, app, stream);
@@ -703,14 +704,20 @@ void addStreamPusherProxy(const string &schema,
     // Add push stream proxy
     auto pusher = s_pusher_proxy.make(key, src, retry_count);
 
+    // 先透传拷贝参数  [AUTO-TRANSLATED:22b5605e]
+    // First pass-through copy parameters
+    for (auto &pr : args) {
+        (*pusher)[pr.first] = pr.second;
+    }
+
     // 指定RTP over TCP(播放rtsp时有效)  [AUTO-TRANSLATED:1a062656]
     // Specify RTP over TCP (effective when playing RTSP)
-    pusher->emplace(Client::kRtpType, rtp_type);
+    (*pusher)[Client::kRtpType] = rtp_type;
 
     if (timeout_sec > 0.1f) {
         // 推流握手超时时间  [AUTO-TRANSLATED:00762fc1]
         // Push stream handshake timeout
-        pusher->emplace(Client::kTimeoutMS, timeout_sec * 1000);
+        (*pusher)[Client::kTimeoutMS] = timeout_sec * 1000;
     }
 
     // 开始推流，如果推流失败或者推流中止，将会自动重试若干次，默认一直重试  [AUTO-TRANSLATED:c8b95088]
@@ -1174,6 +1181,12 @@ void installWebApi() {
     api_regist("/index/api/addStreamPusherProxy", [](API_ARGS_MAP_ASYNC) {
         CHECK_SECRET();
         CHECK_ARGS("schema", "vhost", "app", "stream", "dst_url");
+
+        mINI args;
+        for (auto &pr : allArgs.args) {
+            args.emplace(pr.first, pr.second);
+        }
+
         auto dst_url = allArgs["dst_url"];
         auto retry_count = allArgs["retry_count"].empty() ? -1 : allArgs["retry_count"].as<int>();
         addStreamPusherProxy(allArgs["schema"],
@@ -1184,6 +1197,7 @@ void installWebApi() {
                              retry_count,
                              allArgs["rtp_type"],
                              allArgs["timeout_sec"],
+                             args,
                              [invoker, val, headerOut, dst_url](const SockException &ex, const string &key) mutable {
                                  if (ex) {
                                      val["code"] = API::OtherFailed;

src/CMakeLists.txt

@@ -26,6 +26,14 @@ file(GLOB MediaKit_SRC_LIST
   ${CMAKE_CURRENT_SOURCE_DIR}/*/*.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/*/*.h)
 
+if(NOT ENABLE_SRT)
+    file(GLOB SRT_SRC_LIST
+        ${CMAKE_CURRENT_SOURCE_DIR}/Srt/*.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/Srt/*.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/Srt/*.h)
+    list(REMOVE_ITEM MediaKit_SRC_LIST ${SRT_SRC_LIST})
+endif()
+
 if(USE_SOLUTION_FOLDERS AND (NOT GROUP_BY_EXPLORER))
   # 在 IDE 中对文件进行分组, 源文件和头文件分开
   set_file_group("${CMAKE_CURRENT_SOURCE_DIR}" ${MediaKit_SRC_LIST})
@@ -49,6 +57,7 @@ target_link_libraries(zlmediakit
 target_include_directories(zlmediakit
   PRIVATE
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>"
   PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
 

src/Common/config.cpp

@@ -396,6 +396,8 @@ const string kWaitTrackReady = "wait_track_ready";
 const string kPlayTrack = "play_track";
 const string kProxyUrl = "proxy_url";
 const string kRtspSpeed = "rtsp_speed";
+const string kLatency = "latency";
+const string kPassPhrase = "passPhrase";
 } // namespace Client
 
 } // namespace mediakit

src/Common/config.h

@@ -624,6 +624,10 @@ extern const std::string kProxyUrl;
 // 设置开始rtsp倍速播放  [AUTO-TRANSLATED:5db03cad]
 // Set the start RTSP playback speed
 extern const std::string kRtspSpeed;
+// Set SRT delay
+extern const std::string kLatency;
+// Set SRT PassPhrase
+extern const std::string kPassPhrase;
 } // namespace Client
 } // namespace mediakit
 

src/Player/PlayerBase.cpp

@@ -15,6 +15,9 @@
 #include "Rtmp/FlvPlayer.h"
 #include "Http/HlsPlayer.h"
 #include "Http/TsPlayerImp.h"
+#ifdef ENABLE_SRT
+#include "Srt/SrtPlayerImp.h"
+#endif // ENABLE_SRT
 
 using namespace std;
 using namespace toolkit;
@@ -70,6 +73,12 @@ PlayerBase::Ptr PlayerBase::createPlayer(const EventPoller::Ptr &in_poller, cons
         }
     }
 
+#ifdef ENABLE_SRT
+    if (strcasecmp("srt", prefix.data()) == 0) {
+        return PlayerBase::Ptr(new SrtPlayerImp(poller), release_func);
+    }
+#endif//ENABLE_SRT
+
     throw std::invalid_argument("not supported play schema:" + url_in);
 }
 
@@ -78,6 +87,8 @@ PlayerBase::PlayerBase() {
     this->mINI::operator[](Client::kMediaTimeoutMS) = 5000;
     this->mINI::operator[](Client::kBeatIntervalMS) = 5000;
     this->mINI::operator[](Client::kWaitTrackReady) = true;
+    this->mINI::operator[](Client::kLatency) = 0;
+    this->mINI::operator[](Client::kPassPhrase) = "";
 }
 
 } /* namespace mediakit */

src/Pusher/PusherBase.cpp

@@ -12,6 +12,9 @@
 #include "PusherBase.h"
 #include "Rtsp/RtspPusher.h"
 #include "Rtmp/RtmpPusher.h"
+#ifdef ENABLE_SRT
+#include "Srt/SrtPusher.h"
+#endif // ENABLE_SRT
 
 using namespace toolkit;
 
@@ -50,6 +53,13 @@ PusherBase::Ptr PusherBase::createPusher(const EventPoller::Ptr &in_poller,
         return PusherBase::Ptr(new RtmpPusherImp(poller, std::dynamic_pointer_cast<RtmpMediaSource>(src)), release_func);
     }
 
+#ifdef ENABLE_SRT
+    if (strcasecmp("srt", prefix.data()) == 0) {
+        return PusherBase::Ptr(new SrtPusherImp(poller, std::dynamic_pointer_cast<TSMediaSource>(src)), release_func);
+    }
+#endif//ENABLE_SRT
+
+
     throw std::invalid_argument("not supported push schema:" + url);
 }