From 86348b86ee2b9b564ad6c3fc870c991d54c5f31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E6=A5=9A?= <771730766@qq.com>
Date: Tue, 30 Apr 2024 22:06:53 +0800
Subject: [PATCH 01/36] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 44c22aa9..59fd30a4 100644
--- a/README.md
+++ b/README.md
@@ -222,7 +222,7 @@ bash build_docker_images.sh
- 请关注微信公众号获取最新消息推送：
- - 也可以自愿有偿加入知识星球咨询和获取资料：
+ - 也可以自愿有偿加入知识星球咨询、获取资料以及加入微信技术群：
From 046aaa3498a4dcd4f700c03653f04fef71a4773d Mon Sep 17 00:00:00 2001
From: yanggs
Date: Wed, 1 May 2024 13:19:47 +0800
Subject: [PATCH 02/36] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=89=E5=8F=96?=
=?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=B5=81=E6=97=B6=E6=97=B6=E9=95=BF=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98=20(#3500?=
=?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Rtsp/RtspPlayer.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/Rtsp/RtspPlayer.cpp b/src/Rtsp/RtspPlayer.cpp
index 1cf393e2..e83cc090 100644
--- a/src/Rtsp/RtspPlayer.cpp
+++ b/src/Rtsp/RtspPlayer.cpp
@@ -210,7 +210,8 @@ void RtspPlayer::handleResDESCRIBE(const Parser &parser) {
if (play_track != TrackInvalid) {
auto track = sdpParser.getTrack(play_track);
_sdp_track.emplace_back(track);
- sdp = track->toString();
+ auto title_track = sdpParser.getTrack(TrackTitle);
+ sdp = (title_track ? title_track->toString() : "") + track->toString();
} else {
_sdp_track = sdpParser.getAvailableTrack();
sdp = sdpParser.toString();
From 64fdd78330226afbad8a061fc5419040c54a7509 Mon Sep 17 00:00:00 2001
From: gongluck
Date: Mon, 6 May 2024 11:07:23 +0800
Subject: [PATCH 03/36] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=87=BD=E6=95=B0mk=5F?=
=?UTF-8?q?rtc=5Fsend=5Fdatachannel=E5=A3=B0=E6=98=8E=E3=80=81=E5=AE=9A?=
=?UTF-8?q?=E4=B9=89=E6=B2=A1=E5=AF=B9=E5=BA=94=E7=9A=84=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=20(#3508)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/source/mk_events_objects.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/api/source/mk_events_objects.cpp b/api/source/mk_events_objects.cpp
index 758e38a3..8fdb38af 100644
--- a/api/source/mk_events_objects.cpp
+++ b/api/source/mk_events_objects.cpp
@@ -528,7 +528,7 @@ API_EXPORT void API_CALL mk_auth_invoker_clone_release(const mk_auth_invoker ctx
}
///////////////////////////////////////////WebRtcTransport/////////////////////////////////////////////
-API_EXPORT void API_CALL mk_rtc_sendDatachannel(const mk_rtc_transport ctx, uint16_t streamId, uint32_t ppid, const char *msg, size_t len) {
+API_EXPORT void API_CALL mk_rtc_send_datachannel(const mk_rtc_transport ctx, uint16_t streamId, uint32_t ppid, const char *msg, size_t len) {
#ifdef ENABLE_WEBRTC
assert(ctx && msg);
WebRtcTransport *transport = (WebRtcTransport *)ctx;
From 8ac957f338609365d6a93dc00748b8c5c724b800 Mon Sep 17 00:00:00 2001
From: xia-chu <771730766@qq.com>
Date: Thu, 9 May 2024 18:06:19 +0800
Subject: [PATCH 04/36] bugfix: Fix the memory overflow issue in H264Splitter
---
api/source/mk_h264_splitter.cpp | 39 ++++++++++++---------------------
1 file changed, 14 insertions(+), 25 deletions(-)
diff --git a/api/source/mk_h264_splitter.cpp b/api/source/mk_h264_splitter.cpp
index a6c412f4..b5cd06a3 100644
--- a/api/source/mk_h264_splitter.cpp
+++ b/api/source/mk_h264_splitter.cpp
@@ -27,8 +27,9 @@ protected:
private:
bool _h265 = false;
+ bool _have_decode_frame = false;
onH264 _cb;
- size_t _search_pos = 0;
+ toolkit::BufferLikeString _buffer;
};
void H264Splitter::setOnSplitted(H264Splitter::onH264 cb) {
@@ -42,11 +43,21 @@ H264Splitter::~H264Splitter() {
}
ssize_t H264Splitter::onRecvHeader(const char *data, size_t len) {
- _cb(data, len);
+ auto frame = Factory::getFrameFromPtr(_h265 ? CodecH265 : CodecH264, (char *)data, len, 0, 0);
+ if (_have_decode_frame && (frame->decodeAble() || frame->configFrame())) {
+ // 缓存中存在可解码帧，且下一帧是可解码帧或者配置帧，那么flush缓存
+ _cb(_buffer.data(), _buffer.size());
+ _buffer.assign(data, len);
+ _have_decode_frame = frame->decodeAble();
+ } else {
+ // 还需要缓存
+ _buffer.append(data, len);
+ _have_decode_frame = _have_decode_frame || frame->decodeAble();
+ }
return 0;
}
-static const char *onSearchPacketTail_l(const char *data, size_t len) {
+const char *H264Splitter::onSearchPacketTail(const char *data, size_t len) {
for (size_t i = 2; len > 2 && i < len - 2; ++i) {
//判断0x00 00 01
if (data[i] == 0 && data[i + 1] == 0 && data[i + 2] == 1) {
@@ -60,28 +71,6 @@ static const char *onSearchPacketTail_l(const char *data, size_t len) {
return nullptr;
}
-const char *H264Splitter::onSearchPacketTail(const char *data, size_t len) {
- auto last_frame = data + _search_pos;
- auto next_frame = onSearchPacketTail_l(last_frame, len - _search_pos);
- if (!next_frame) {
- return nullptr;
- }
-
- auto last_frame_len = next_frame - last_frame;
- Frame::Ptr frame;
- if (_h265) {
- frame = Factory::getFrameFromPtr(CodecH265, (char *)last_frame, last_frame_len, 0, 0);
- } else {
- frame = Factory::getFrameFromPtr(CodecH264, (char *)last_frame, last_frame_len, 0, 0);
- }
- if (frame->decodeAble()) {
- _search_pos = 0;
- return next_frame;
- }
- _search_pos += last_frame_len;
- return nullptr;
-}
-
////////////////////////////////////////////////////////////////////////////////////////////////////////
API_EXPORT mk_h264_splitter API_CALL mk_h264_splitter_create(on_mk_h264_splitter_frame cb, void *user_data, int is_h265) {
From 2eed284e617c7833cf648474a3ac2ba2864a47f5 Mon Sep 17 00:00:00 2001
From: xia-chu <771730766@qq.com>
Date: Thu, 9 May 2024 18:07:08 +0800
Subject: [PATCH 05/36] feat: Close the connection after authentication failed
in HTTP API
Improve the safety of HTTP API
---
server/WebApi.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/server/WebApi.cpp b/server/WebApi.cpp
index 8ea758f3..30a6c559 100755
--- a/server/WebApi.cpp
+++ b/server/WebApi.cpp
@@ -289,6 +289,8 @@ static inline void addHttpListener(){
it->second(parser, invoker, sender);
} catch (ApiRetException &ex) {
responseApi(ex.code(), ex.what(), invoker);
+ auto helper = static_cast(sender).shared_from_this();
+ helper->getPoller()->async([helper, ex]() { helper->shutdown(SockException(Err_shutdown, ex.what())); }, false);
}
#ifdef ENABLE_MYSQL
catch(SqlException &ex){
From 18c5bb36707fbf7de02573bdc77182d1080b0920 Mon Sep 17 00:00:00 2001
From: Lidaofu <746101210@qq.com>
Date: Fri, 10 May 2024 14:27:23 +0800
Subject: [PATCH 06/36] =?UTF-8?q?=E6=B7=BB=E5=8A=A0C=20API=20on=5Frecord?=
=?UTF-8?q?=5Fts=20=E5=9B=9E=E8=B0=83ts=E5=BD=95=E5=83=8F=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=20(#3520)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
用时合并on_record_mp4相关接口
Co-authored-by: 李道甫
---
api/include/mk_events.h | 21 ++++++++++-------
api/include/mk_events_objects.h | 39 +++++++++++++++++++++-----------
api/source/mk_events.cpp | 8 ++++++-
api/source/mk_events_objects.cpp | 20 ++++++++--------
api/tests/server.c | 22 +++++++++---------
5 files changed, 67 insertions(+), 43 deletions(-)
diff --git a/api/include/mk_events.h b/api/include/mk_events.h
index 8f433a2a..d765a8fa 100644
--- a/api/include/mk_events.h
+++ b/api/include/mk_events.h
@@ -132,7 +132,12 @@ typedef struct {
/**
* 录制mp4分片文件成功后广播
*/
- void (API_CALL *on_mk_record_mp4)(const mk_mp4_info mp4);
+ void (API_CALL *on_mk_record_mp4)(const mk_record_info mp4);
+
+ /**
+ * 录制ts分片文件成功后广播
+ */
+ void (API_CALL *on_mk_record_ts)(const mk_record_info ts);
/**
* shell登录鉴权
@@ -175,16 +180,16 @@ typedef struct {
* @param err 错误代码
* @param msg 错误提示
*/
- void(API_CALL *on_mk_media_send_rtp_stop)(const char *vhost, const char *app, const char *stream, const char *ssrc, int err, const char *msg);
+ void (API_CALL *on_mk_media_send_rtp_stop)(const char *vhost, const char *app, const char *stream, const char *ssrc, int err, const char *msg);
/**
* rtc sctp连接中/完成/失败/关闭回调
* @param rtc_transport 数据通道对象
*/
- void(API_CALL *on_mk_rtc_sctp_connecting)(mk_rtc_transport rtc_transport);
- void(API_CALL *on_mk_rtc_sctp_connected)(mk_rtc_transport rtc_transport);
- void(API_CALL *on_mk_rtc_sctp_failed)(mk_rtc_transport rtc_transport);
- void(API_CALL *on_mk_rtc_sctp_closed)(mk_rtc_transport rtc_transport);
+ void (API_CALL *on_mk_rtc_sctp_connecting)(mk_rtc_transport rtc_transport);
+ void (API_CALL *on_mk_rtc_sctp_connected)(mk_rtc_transport rtc_transport);
+ void (API_CALL *on_mk_rtc_sctp_failed)(mk_rtc_transport rtc_transport);
+ void (API_CALL *on_mk_rtc_sctp_closed)(mk_rtc_transport rtc_transport);
/**
* rtc数据通道发送数据回调
@@ -192,7 +197,7 @@ typedef struct {
* @param msg 数据
* @param len 数据长度
*/
- void(API_CALL *on_mk_rtc_sctp_send)(mk_rtc_transport rtc_transport, const uint8_t *msg, size_t len);
+ void (API_CALL *on_mk_rtc_sctp_send)(mk_rtc_transport rtc_transport, const uint8_t *msg, size_t len);
/**
* rtc数据通道接收数据回调
@@ -202,7 +207,7 @@ typedef struct {
* @param msg 数据
* @param len 数据长度
*/
- void(API_CALL *on_mk_rtc_sctp_received)(mk_rtc_transport rtc_transport, uint16_t streamId, uint32_t ppid, const uint8_t *msg, size_t len);
+ void (API_CALL *on_mk_rtc_sctp_received)(mk_rtc_transport rtc_transport, uint16_t streamId, uint32_t ppid, const uint8_t *msg, size_t len);
} mk_events;
diff --git a/api/include/mk_events_objects.h b/api/include/mk_events_objects.h
index 428f9dc6..d28dbc62 100644
--- a/api/include/mk_events_objects.h
+++ b/api/include/mk_events_objects.h
@@ -18,29 +18,42 @@
extern "C" {
#endif
-///////////////////////////////////////////MP4Info/////////////////////////////////////////////
-//MP4Info对象的C映射
-typedef struct mk_mp4_info_t *mk_mp4_info;
+///////////////////////////////////////////RecordInfo/////////////////////////////////////////////
+//RecordInfo对象的C映射
+typedef struct mk_record_info_t *mk_record_info;
// GMT 标准时间，单位秒
-API_EXPORT uint64_t API_CALL mk_mp4_info_get_start_time(const mk_mp4_info ctx);
+API_EXPORT uint64_t API_CALL mk_record_info_get_start_time(const mk_record_info ctx);
// 录像长度，单位秒
-API_EXPORT float API_CALL mk_mp4_info_get_time_len(const mk_mp4_info ctx);
+API_EXPORT float API_CALL mk_record_info_get_time_len(const mk_record_info ctx);
// 文件大小，单位 BYTE
-API_EXPORT size_t API_CALL mk_mp4_info_get_file_size(const mk_mp4_info ctx);
+API_EXPORT size_t API_CALL mk_record_info_get_file_size(const mk_record_info ctx);
// 文件路径
-API_EXPORT const char* API_CALL mk_mp4_info_get_file_path(const mk_mp4_info ctx);
+API_EXPORT const char *API_CALL mk_record_info_get_file_path(const mk_record_info ctx);
// 文件名称
-API_EXPORT const char* API_CALL mk_mp4_info_get_file_name(const mk_mp4_info ctx);
+API_EXPORT const char *API_CALL mk_record_info_get_file_name(const mk_record_info ctx);
// 文件夹路径
-API_EXPORT const char* API_CALL mk_mp4_info_get_folder(const mk_mp4_info ctx);
+API_EXPORT const char *API_CALL mk_record_info_get_folder(const mk_record_info ctx);
// 播放路径
-API_EXPORT const char* API_CALL mk_mp4_info_get_url(const mk_mp4_info ctx);
+API_EXPORT const char *API_CALL mk_record_info_get_url(const mk_record_info ctx);
// 应用名称
-API_EXPORT const char* API_CALL mk_mp4_info_get_vhost(const mk_mp4_info ctx);
+API_EXPORT const char *API_CALL mk_record_info_get_vhost(const mk_record_info ctx);
// 流 ID
-API_EXPORT const char* API_CALL mk_mp4_info_get_app(const mk_mp4_info ctx);
+API_EXPORT const char *API_CALL mk_record_info_get_app(const mk_record_info ctx);
// 虚拟主机
-API_EXPORT const char* API_CALL mk_mp4_info_get_stream(const mk_mp4_info ctx);
+API_EXPORT const char *API_CALL mk_record_info_get_stream(const mk_record_info ctx);
+
+//// 下面宏保障用户代码兼容性, 二进制abi不兼容，用户需要重新编译链接 /////
+#define mk_mp4_info mk_record_info
+#define mk_mp4_info_get_start_time mk_record_info_get_start_time
+#define mk_mp4_info_get_time_len mk_record_info_get_time_len
+#define mk_mp4_info_get_file_size mk_record_info_get_file_size
+#define mk_mp4_info_get_file_path mk_record_info_get_file_path
+#define mk_mp4_info_get_file_name mk_record_info_get_file_name
+#define mk_mp4_info_get_folder mk_record_info_get_folder
+#define mk_mp4_info_get_url mk_record_info_get_url
+#define mk_mp4_info_get_vhost mk_record_info_get_vhost
+#define mk_mp4_info_get_app mk_record_info_get_app
+#define mk_mp4_info_get_stream mk_record_info_get_stream
///////////////////////////////////////////Parser/////////////////////////////////////////////
//Parser对象的C映射
diff --git a/api/source/mk_events.cpp b/api/source/mk_events.cpp
index 7f5ed661..a835a7c9 100644
--- a/api/source/mk_events.cpp
+++ b/api/source/mk_events.cpp
@@ -42,7 +42,13 @@ API_EXPORT void API_CALL mk_events_listen(const mk_events *events){
NoticeCenter::Instance().addListener(&s_tag,Broadcast::kBroadcastRecordMP4,[](BroadcastRecordMP4Args){
if(s_events.on_mk_record_mp4){
- s_events.on_mk_record_mp4((mk_mp4_info)&info);
+ s_events.on_mk_record_mp4((mk_record_info)&info);
+ }
+ });
+
+ NoticeCenter::Instance().addListener(&s_tag, Broadcast::kBroadcastRecordTs, [](BroadcastRecordTsArgs) {
+ if (s_events.on_mk_record_ts) {
+ s_events.on_mk_record_ts((mk_record_info)&info);
}
});
diff --git a/api/source/mk_events_objects.cpp b/api/source/mk_events_objects.cpp
index 8fdb38af..3615bbcd 100644
--- a/api/source/mk_events_objects.cpp
+++ b/api/source/mk_events_objects.cpp
@@ -26,61 +26,61 @@ using namespace toolkit;
using namespace mediakit;
///////////////////////////////////////////RecordInfo/////////////////////////////////////////////
-API_EXPORT uint64_t API_CALL mk_mp4_info_get_start_time(const mk_mp4_info ctx){
+API_EXPORT uint64_t API_CALL mk_record_info_get_start_time(const mk_record_info ctx) {
assert(ctx);
RecordInfo *info = (RecordInfo *)ctx;
return info->start_time;
}
-API_EXPORT float API_CALL mk_mp4_info_get_time_len(const mk_mp4_info ctx){
+API_EXPORT float API_CALL mk_record_info_get_time_len(const mk_record_info ctx) {
assert(ctx);
RecordInfo *info = (RecordInfo *)ctx;
return info->time_len;
}
-API_EXPORT size_t API_CALL mk_mp4_info_get_file_size(const mk_mp4_info ctx){
+API_EXPORT size_t API_CALL mk_record_info_get_file_size(const mk_record_info ctx) {
assert(ctx);
RecordInfo *info = (RecordInfo *)ctx;
return info->file_size;
}
-API_EXPORT const char* API_CALL mk_mp4_info_get_file_path(const mk_mp4_info ctx){
+API_EXPORT const char *API_CALL mk_record_info_get_file_path(const mk_record_info ctx) {
assert(ctx);
RecordInfo *info = (RecordInfo *)ctx;
return info->file_path.c_str();
}
-API_EXPORT const char* API_CALL mk_mp4_info_get_file_name(const mk_mp4_info ctx){
+API_EXPORT const char *API_CALL mk_record_info_get_file_name(const mk_record_info ctx) {
assert(ctx);
RecordInfo *info = (RecordInfo *)ctx;
return info->file_name.c_str();
}
-API_EXPORT const char* API_CALL mk_mp4_info_get_folder(const mk_mp4_info ctx){
+API_EXPORT const char *API_CALL mk_record_info_get_folder(const mk_record_info ctx) {
assert(ctx);
RecordInfo *info = (RecordInfo *)ctx;
return info->folder.c_str();
}
-API_EXPORT const char* API_CALL mk_mp4_info_get_url(const mk_mp4_info ctx){
+API_EXPORT const char *API_CALL mk_record_info_get_url(const mk_record_info ctx) {
assert(ctx);
RecordInfo *info = (RecordInfo *)ctx;
return info->url.c_str();
}
-API_EXPORT const char* API_CALL mk_mp4_info_get_vhost(const mk_mp4_info ctx){
+API_EXPORT const char *API_CALL mk_record_info_get_vhost(const mk_record_info ctx) {
assert(ctx);
RecordInfo *info = (RecordInfo *)ctx;
return info->vhost.c_str();
}
-API_EXPORT const char* API_CALL mk_mp4_info_get_app(const mk_mp4_info ctx){
+API_EXPORT const char *API_CALL mk_record_info_get_app(const mk_record_info ctx) {
assert(ctx);
RecordInfo *info = (RecordInfo *)ctx;
return info->app.c_str();
}
-API_EXPORT const char* API_CALL mk_mp4_info_get_stream(const mk_mp4_info ctx){
+API_EXPORT const char *API_CALL mk_record_info_get_stream(const mk_record_info ctx) {
assert(ctx);
RecordInfo *info = (RecordInfo *)ctx;
return info->stream.c_str();
diff --git a/api/tests/server.c b/api/tests/server.c
index 4f76fe60..28f44ada 100644
--- a/api/tests/server.c
+++ b/api/tests/server.c
@@ -387,7 +387,7 @@ void API_CALL on_mk_rtsp_auth(const mk_media_info url_info,
/**
* 录制mp4分片文件成功后广播
*/
-void API_CALL on_mk_record_mp4(const mk_mp4_info mp4) {
+void API_CALL on_mk_record_mp4(const mk_record_info mp4) {
log_printf(LOG_LEV,
"\nstart_time: %d\n"
"time_len: %d\n"
@@ -399,16 +399,16 @@ void API_CALL on_mk_record_mp4(const mk_mp4_info mp4) {
"vhost: %s\n"
"app: %s\n"
"stream: %s\n",
- mk_mp4_info_get_start_time(mp4),
- mk_mp4_info_get_time_len(mp4),
- mk_mp4_info_get_file_size(mp4),
- mk_mp4_info_get_file_path(mp4),
- mk_mp4_info_get_file_name(mp4),
- mk_mp4_info_get_folder(mp4),
- mk_mp4_info_get_url(mp4),
- mk_mp4_info_get_vhost(mp4),
- mk_mp4_info_get_app(mp4),
- mk_mp4_info_get_stream(mp4));
+ mk_record_info_get_start_time(mp4),
+ mk_record_info_get_time_len(mp4),
+ mk_record_info_get_file_size(mp4),
+ mk_record_info_get_file_path(mp4),
+ mk_record_info_get_file_name(mp4),
+ mk_record_info_get_folder(mp4),
+ mk_record_info_get_url(mp4),
+ mk_record_info_get_vhost(mp4),
+ mk_record_info_get_app(mp4),
+ mk_record_info_get_stream(mp4));
}
/**
From 1c89950ebeb5e45d3bd92ac1595993c1185a6f94 Mon Sep 17 00:00:00 2001
From: xiongguangjie
Date: Sat, 11 May 2024 10:49:33 +0800
Subject: [PATCH 07/36] Fix record info size to int64 (#3527)
---
src/Record/Recorder.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Record/Recorder.h b/src/Record/Recorder.h
index ea924618..1913ae05 100644
--- a/src/Record/Recorder.h
+++ b/src/Record/Recorder.h
@@ -32,7 +32,7 @@ class RecordInfo: public MediaTuple {
public:
time_t start_time; // GMT 标准时间，单位秒
float time_len; // 录像长度，单位秒
- off_t file_size; // 文件大小，单位 BYTE
+ uint64_t file_size; // 文件大小，单位 BYTE
std::string file_path; // 文件路径
std::string file_name; // 文件名称
std::string folder; // 文件夹路径
From bbdbd6a3e0b73123202965e1899791ffec351572 Mon Sep 17 00:00:00 2001
From: xia-chu <771730766@qq.com>
Date: Sat, 11 May 2024 14:38:33 +0800
Subject: [PATCH 08/36] feat: Using kBeatIntervalMS option for rtsp heartbeat
interval time and add kRtspBeatType for setting rtsp heartbeat type
---
src/Common/config.cpp | 1 +
src/Common/config.h | 3 +++
src/Rtsp/RtspPlayer.cpp | 27 ++++++++++++++++-----------
src/Rtsp/RtspPlayer.h | 5 +++++
4 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/Common/config.cpp b/src/Common/config.cpp
index 5a538ab4..8b7031ae 100644
--- a/src/Common/config.cpp
+++ b/src/Common/config.cpp
@@ -361,6 +361,7 @@ static onceToken token([]() {
namespace Client {
const string kNetAdapter = "net_adapter";
const string kRtpType = "rtp_type";
+const string kRtspBeatType = "rtsp_beat_type";
const string kRtspUser = "rtsp_user";
const string kRtspPwd = "rtsp_pwd";
const string kRtspPwdIsMD5 = "rtsp_pwd_md5";
diff --git a/src/Common/config.h b/src/Common/config.h
index 98ab289c..b10fe685 100644
--- a/src/Common/config.h
+++ b/src/Common/config.h
@@ -417,6 +417,9 @@ extern const std::string kNetAdapter;
// 设置rtp传输类型，可选项有0(tcp，默认)、1(udp)、2(组播)
// 设置方法:player[PlayerBase::kRtpType] = 0/1/2;
extern const std::string kRtpType;
+// rtsp播放器发送信令心跳还是rtcp心跳，可选项有0(同时发)、1(rtcp心跳)、2(信令心跳)
+// 设置方法:player[PlayerBase::kRtspBeatType] = 0/1/2;
+extern const std::string kRtspBeatType;
// rtsp认证用户名
extern const std::string kRtspUser;
// rtsp认证用用户密码，可以是明文也可以是md5,md5密码生成方式 md5(username:realm:password)
diff --git a/src/Rtsp/RtspPlayer.cpp b/src/Rtsp/RtspPlayer.cpp
index e83cc090..5d279fd7 100644
--- a/src/Rtsp/RtspPlayer.cpp
+++ b/src/Rtsp/RtspPlayer.cpp
@@ -28,6 +28,7 @@ using namespace std;
namespace mediakit {
enum PlayType { type_play = 0, type_pause, type_seek, type_speed };
+enum class BeatType : uint32_t { both = 0, rtcp, cmd };
RtspPlayer::RtspPlayer(const EventPoller::Ptr &poller)
: TcpClient(poller) {}
@@ -85,6 +86,8 @@ void RtspPlayer::play(const string &strUrl) {
_play_url = url._url;
_rtp_type = (Rtsp::eRtpType)(int)(*this)[Client::kRtpType];
+ _beat_type = (*this)[Client::kRtspBeatType].as();
+ _beat_interval_ms = (*this)[Client::kBeatIntervalMS].as();
DebugL << url._url << " " << (url._user.size() ? url._user : "null") << " " << (url._passwd.size() ? url._passwd : "null") << " " << _rtp_type;
weak_ptr weakSelf = static_pointer_cast(shared_from_this());
@@ -642,23 +645,28 @@ void RtspPlayer::onBeforeRtpSorted(const RtpPacket::Ptr &rtp, int track_idx) {
rtcp_ctx->onRtp(rtp->getSeq(), rtp->getStamp(), rtp->ntp_stamp, rtp->sample_rate, rtp->size() - RtpPacket::kRtpTcpHeaderSize);
auto &ticker = _rtcp_send_ticker[track_idx];
- if (ticker.elapsedTime() < 3 * 1000) {
- // 时间未到
+ if (ticker.elapsedTime() < _beat_interval_ms) {
+ // 心跳时间未到
return;
}
- auto &rtcp_flag = _send_rtcp[track_idx];
- // 每3秒发送一次心跳，rtcp与rtsp信令轮流心跳，该特性用于兼容issue:642
- // 有些rtsp服务器需要rtcp保活，有些需要发送信令保活
+ // 有些rtsp服务器需要rtcp保活，有些需要发送信令保活; rtcp与rtsp信令轮流心跳，该特性用于兼容issue:#642
+ auto &rtcp_flag = _send_rtcp[track_idx];
+ ticker.resetTime();
+
+ switch ((BeatType)_beat_type) {
+ case BeatType::cmd: rtcp_flag = false; break;
+ case BeatType::rtcp: rtcp_flag = true; break;
+ case BeatType::both:
+ default: rtcp_flag = !rtcp_flag; break;
+ }
// 发送信令保活
if (!rtcp_flag) {
if (track_idx == 0) {
+ // 两个track无需同时触发发送信令保活
sendKeepAlive();
}
- ticker.resetTime();
- // 下次发送rtcp保活
- rtcp_flag = true;
return;
}
@@ -680,9 +688,6 @@ void RtspPlayer::onBeforeRtpSorted(const RtpPacket::Ptr &rtp, int track_idx) {
rtcp_sdes->chunks.ssrc = htonl(ssrc);
send_rtcp(this, track_idx, std::move(rtcp));
send_rtcp(this, track_idx, RtcpHeader::toBuffer(rtcp_sdes));
- ticker.resetTime();
- // 下次发送信令保活
- rtcp_flag = false;
}
void RtspPlayer::onPlayResult_l(const SockException &ex, bool handshake_done) {
diff --git a/src/Rtsp/RtspPlayer.h b/src/Rtsp/RtspPlayer.h
index 66882c20..c40d72b7 100644
--- a/src/Rtsp/RtspPlayer.h
+++ b/src/Rtsp/RtspPlayer.h
@@ -114,6 +114,11 @@ private:
//轮流发送rtcp与GET_PARAMETER保活
bool _send_rtcp[2] = {true, true};
+ // 心跳类型
+ uint32_t _beat_type = 0;
+ // 心跳保护间隔
+ uint32_t _beat_interval_ms = 0;
+
std::string _play_url;
std::vector _sdp_track;
std::function _on_response;
From 5df2b8075749af1a4d8107f71485b4e2bd222716 Mon Sep 17 00:00:00 2001
From: gongluck
Date: Sun, 12 May 2024 18:15:11 +0800
Subject: [PATCH 09/36] =?UTF-8?q?Nack=E7=9B=B8=E5=85=B3=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE=E5=8C=96=20(#3510=20#3507)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
conf/config.ini | 18 +++++++++++
webrtc/Nack.cpp | 61 +++++++++++++++++++++++++++++++-------
webrtc/Nack.h | 12 --------
webrtc/WebRtcTransport.cpp | 8 ++++-
4 files changed, 76 insertions(+), 23 deletions(-)
diff --git a/conf/config.ini b/conf/config.ini
index 872d2d32..89800db2 100644
--- a/conf/config.ini
+++ b/conf/config.ini
@@ -367,6 +367,24 @@ start_bitrate=0
max_bitrate=0
min_bitrate=0
+#nack接收端
+#Nack缓存包最早时间间隔
+maxNackMS=5000
+#Nack包检查间隔(包数量)
+rtpCacheCheckInterval=100
+
+#nack发送端
+#最大保留的rtp丢包状态个数
+nackMaxSize=2048
+#rtp丢包状态最长保留时间
+nackMaxMS=3000
+#nack最多请求重传次数
+nackMaxCount=15
+#nack重传频率，rtt的倍数
+nackIntervalRatio=1.0
+#nack包中rtp个数，减小此值可以让nack包响应更灵敏
+nackRtpSize=8
+
[srt]
#srt播放推流、播放超时时间,单位秒
timeoutSec=5
diff --git a/webrtc/Nack.cpp b/webrtc/Nack.cpp
index 6197117e..4fd1f101 100644
--- a/webrtc/Nack.cpp
+++ b/webrtc/Nack.cpp
@@ -9,24 +9,56 @@
*/
#include "Nack.h"
+#include "Common/config.h"
using namespace std;
using namespace toolkit;
namespace mediakit {
-static constexpr uint32_t kMaxNackMS = 5 * 1000;
-static constexpr uint32_t kRtpCacheCheckInterval = 100;
+// RTC配置项目
+namespace Rtc {
+#define RTC_FIELD "rtc."
+//~ nack接收端
+// Nack缓存包最早时间间隔
+const string kMaxNackMS = RTC_FIELD "maxNackMS";
+// Nack包检查间隔(包数量)
+const string kRtpCacheCheckInterval = RTC_FIELD "rtpCacheCheckInterval";
+//~ nack发送端
+//最大保留的rtp丢包状态个数
+const string kNackMaxSize = RTC_FIELD "nackMaxSize";
+// rtp丢包状态最长保留时间
+const string kNackMaxMS = RTC_FIELD "nackMaxMS";
+// nack最多请求重传次数
+const string kNackMaxCount = RTC_FIELD "nackMaxCount";
+// nack重传频率，rtt的倍数
+const string kNackIntervalRatio = RTC_FIELD "nackIntervalRatio";
+// nack包中rtp个数，减小此值可以让nack包响应更灵敏
+const string kNackRtpSize = RTC_FIELD "nackRtpSize";
+
+static onceToken token([]() {
+ mINI::Instance()[kMaxNackMS] = 5 * 1000;
+ mINI::Instance()[kRtpCacheCheckInterval] = 100;
+ mINI::Instance()[kNackMaxSize] = 2048;
+ mINI::Instance()[kNackMaxMS] = 3 * 1000;
+ mINI::Instance()[kNackMaxCount] = 15;
+ mINI::Instance()[kNackIntervalRatio] = 1.0f;
+ mINI::Instance()[kNackRtpSize] = 8;
+});
+
+} // namespace Rtc
void NackList::pushBack(RtpPacket::Ptr rtp) {
auto seq = rtp->getSeq();
_nack_cache_seq.emplace_back(seq);
_nack_cache_pkt.emplace(seq, std::move(rtp));
- if (++_cache_ms_check < kRtpCacheCheckInterval) {
+ GET_CONFIG(uint32_t, rtpcache_checkinterval, Rtc::kRtpCacheCheckInterval);
+ if (++_cache_ms_check < rtpcache_checkinterval) {
return;
}
_cache_ms_check = 0;
- while (getCacheMS() >= kMaxNackMS) {
+ GET_CONFIG(uint32_t, maxnackms, Rtc::kMaxNackMS);
+ while (getCacheMS() >= maxnackms) {
// 需要清除部分nack缓存
popFront();
}
@@ -148,10 +180,13 @@ void NackContext::makeNack(uint16_t max_seq, bool flush) {
eraseFrontSeq();
// 最多生成5个nack包，防止seq大幅跳跃导致一直循环
auto max_nack = 5u;
+ GET_CONFIG(uint32_t, nack_rtpsize, Rtc::kNackRtpSize);
+ // kNackRtpSize must between 0 and 16
+ nack_rtpsize = std::min(nack_rtpsize, FCI_NACK::kBitSize);
while (_nack_seq != max_seq && max_nack--) {
// 一次不能发送超过16+1个rtp的状态
uint16_t nack_rtp_count = std::min(FCI_NACK::kBitSize, max_seq - (uint16_t)(_nack_seq + 1));
- if (!flush && nack_rtp_count < kNackRtpSize) {
+ if (!flush && nack_rtp_count < nack_rtpsize) {
// 非flush状态下，seq个数不足以发送一次nack
break;
}
@@ -206,7 +241,9 @@ void NackContext::clearNackStatus(uint16_t seq) {
_nack_send_status.erase(it);
// 限定rtt在合理有效范围内
- _rtt = max(10, min(rtt, kNackMaxMS / kNackMaxCount));
+ GET_CONFIG(uint32_t, nack_maxms, Rtc::kNackMaxMS);
+ GET_CONFIG(uint32_t, nack_maxcount, Rtc::kNackMaxCount);
+ _rtt = max(10, min(rtt, nack_maxms / nack_maxcount));
}
void NackContext::recordNack(const FCI_NACK &nack) {
@@ -222,7 +259,8 @@ void NackContext::recordNack(const FCI_NACK &nack) {
++i;
}
// 记录太多了，移除一部分早期的记录
- while (_nack_send_status.size() > kNackMaxSize) {
+ GET_CONFIG(uint32_t, nack_maxsize, Rtc::kNackMaxSize);
+ while (_nack_send_status.size() > nack_maxsize) {
_nack_send_status.erase(_nack_send_status.begin());
}
}
@@ -230,13 +268,16 @@ void NackContext::recordNack(const FCI_NACK &nack) {
uint64_t NackContext::reSendNack() {
set nack_rtp;
auto now = getCurrentMillisecond();
+ GET_CONFIG(uint32_t, nack_maxms, Rtc::kNackMaxMS);
+ GET_CONFIG(uint32_t, nack_maxcount, Rtc::kNackMaxCount);
+ GET_CONFIG(float, nack_intervalratio, Rtc::kNackIntervalRatio);
for (auto it = _nack_send_status.begin(); it != _nack_send_status.end();) {
- if (now - it->second.first_stamp > kNackMaxMS) {
+ if (now - it->second.first_stamp > nack_maxms) {
// 该rtp丢失太久了，不再要求重传
it = _nack_send_status.erase(it);
continue;
}
- if (now - it->second.update_stamp < kNackIntervalRatio * _rtt) {
+ if (now - it->second.update_stamp < nack_intervalratio * _rtt) {
// 距离上次nack不足2倍的rtt，不用再发送nack
++it;
continue;
@@ -245,7 +286,7 @@ uint64_t NackContext::reSendNack() {
nack_rtp.emplace(it->first);
// 更新nack发送时间戳
it->second.update_stamp = now;
- if (++(it->second.nack_count) == kNackMaxCount) {
+ if (++(it->second.nack_count) == nack_maxcount) {
// nack次数太多，移除之
it = _nack_send_status.erase(it);
continue;
diff --git a/webrtc/Nack.h b/webrtc/Nack.h
index b0cd22b4..8ed98be9 100644
--- a/webrtc/Nack.h
+++ b/webrtc/Nack.h
@@ -41,18 +41,6 @@ class NackContext {
public:
using Ptr = std::shared_ptr;
using onNack = std::function;
- //最大保留的rtp丢包状态个数
- static constexpr auto kNackMaxSize = 2048;
- // rtp丢包状态最长保留时间
- static constexpr auto kNackMaxMS = 3 * 1000;
- // nack最多请求重传10次
- static constexpr auto kNackMaxCount = 15;
- // nack重传频率，rtt的倍数
- static constexpr auto kNackIntervalRatio = 1.0f;
- // nack包中rtp个数，减小此值可以让nack包响应更灵敏
- static constexpr auto kNackRtpSize = 8;
-
- static_assert(kNackRtpSize >=0 && kNackRtpSize <= FCI_NACK::kBitSize, "NackContext::kNackRtpSize must between 0 and 16");
NackContext();
diff --git a/webrtc/WebRtcTransport.cpp b/webrtc/WebRtcTransport.cpp
index 768c543e..3d2aaa68 100644
--- a/webrtc/WebRtcTransport.cpp
+++ b/webrtc/WebRtcTransport.cpp
@@ -57,6 +57,9 @@ const string kMinBitrate = RTC_FIELD "min_bitrate";
// 数据通道设置
const string kDataChannelEcho = RTC_FIELD "datachannel_echo";
+// rtp丢包状态最长保留时间
+const string kNackMaxMS = RTC_FIELD "nackMaxMS";
+
static onceToken token([]() {
mINI::Instance()[kTimeOutSec] = 15;
mINI::Instance()[kExternIP] = "";
@@ -69,6 +72,8 @@ static onceToken token([]() {
mINI::Instance()[kMinBitrate] = 0;
mINI::Instance()[kDataChannelEcho] = true;
+
+ mINI::Instance()[kNackMaxMS] = 3 * 1000;
});
} // namespace RTC
@@ -800,7 +805,8 @@ public:
_on_nack = std::move(on_nack);
setOnSorted(std::move(cb));
//设置jitter buffer参数
- RtpTrackImp::setParams(1024, NackContext::kNackMaxMS, 512);
+ GET_CONFIG(uint32_t, nack_maxms, Rtc::kNackMaxMS);
+ RtpTrackImp::setParams(1024, nack_maxms, 512);
_nack_ctx.setOnNack([this](const FCI_NACK &nack) { onNack(nack); });
}
From 472d7d1e4fe650ad51088270160b26e20a32bb8c Mon Sep 17 00:00:00 2001
From: admin <964472638@qq.com>
Date: Wed, 15 May 2024 11:17:12 +0800
Subject: [PATCH 10/36] =?UTF-8?q?=E5=85=BC=E5=AE=B9rtsp=E6=9C=8D=E5=8A=A1?=
=?UTF-8?q?=E7=AB=AF=E5=8F=91=E9=80=81=E7=BC=93=E5=86=B2=E5=8C=BA=E6=BA=A2?=
=?UTF-8?q?=E5=87=BA=E8=A6=86=E7=9B=96=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Rtsp/RtspSplitter.cpp | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/Rtsp/RtspSplitter.cpp b/src/Rtsp/RtspSplitter.cpp
index 06e9f8c3..33e6e694 100644
--- a/src/Rtsp/RtspSplitter.cpp
+++ b/src/Rtsp/RtspSplitter.cpp
@@ -10,8 +10,9 @@
#include
#include "RtspSplitter.h"
-#include "Util/logger.h"
#include "Util/util.h"
+#include "Util/logger.h"
+#include "Common/macros.h"
using namespace std;
using namespace toolkit;
@@ -64,7 +65,18 @@ ssize_t RtspSplitter::onRecvHeader(const char *data, size_t len) {
if (len == 4 && !memcmp(data, "\r\n\r\n", 4)) {
return 0;
}
- _parser.parse(data, len);
+ try {
+ _parser.parse(data, len);
+ } catch (mediakit::AssertFailedException &ex){
+ if (!_enableRecvRtp) {
+ // 还在握手中，直接中断握手
+ throw;
+ }
+ // 握手已经结束，如果rtsp server存在发送缓存溢出的bug，那么rtsp信令可能跟rtp混在一起
+ // 这种情况下，rtsp信令解析异常不中断链接，只丢弃这个包
+ WarnL << ex.what();
+ return 0;
+ }
auto ret = getContentLength(_parser);
if (ret == 0) {
onWholeRtspPacket(_parser);
From 65c2abb0b53997a3fc164ae40d8b0f8ce21c46dd Mon Sep 17 00:00:00 2001
From: admin <964472638@qq.com>
Date: Wed, 15 May 2024 11:30:16 +0800
Subject: [PATCH 11/36] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?=
=?UTF-8?q?=E5=88=A0=E9=99=A4mp4=E5=BD=95=E5=83=8F=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
server/WebApi.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/WebApi.cpp b/server/WebApi.cpp
index 30a6c559..988b55b5 100755
--- a/server/WebApi.cpp
+++ b/server/WebApi.cpp
@@ -1590,12 +1590,14 @@ void installWebApi() {
auto record_path = Recorder::getRecordPath(Recorder::type_mp4, tuple, allArgs["customized_path"]);
auto period = allArgs["period"];
record_path = record_path + period + "/";
+
+ bool recording = false;
auto name = allArgs["name"];
if (!name.empty()) {
+ // 删除指定文件
record_path += name;
- }
- bool recording = false;
- {
+ } else {
+ // 删除文件夹，先判断该流是否正在录制中
auto src = MediaSource::find(allArgs["vhost"], allArgs["app"], allArgs["stream"]);
if (src && src->isRecording(Recorder::type_mp4)) {
recording = true;
From 0935da60a3d4674b962bbe78698c0bd4ad0cd689 Mon Sep 17 00:00:00 2001
From: PioLing <964472638@qq.com>
Date: Sun, 19 May 2024 10:30:29 +0800
Subject: [PATCH 12/36] feat: Add on_mk_get_statistic_cb c api to obtain
performance statistics data (#3549)
---
api/include/mk_util.h | 9 +++
api/source/mk_util.cpp | 126 +++++++++++++++++++++++++++++++++++++++++
api/tests/server.c | 11 ++++
3 files changed, 146 insertions(+)
diff --git a/api/include/mk_util.h b/api/include/mk_util.h
index 32f9da7a..fb79dc82 100644
--- a/api/include/mk_util.h
+++ b/api/include/mk_util.h
@@ -128,6 +128,15 @@ API_EXPORT char *API_CALL mk_ini_dump_string(mk_ini ini);
* @param file 配置文件路径
*/
API_EXPORT void API_CALL mk_ini_dump_file(mk_ini ini, const char *file);
+///////////////////////////////////////////统计/////////////////////////////////////////////
+
+typedef void(API_CALL *on_mk_get_statistic_cb)(void *user_data, mk_ini ini);
+
+/**
+ * 获取内存数据统计
+ * @param ini 存放统计结果
+ */
+API_EXPORT void API_CALL mk_get_statistic(on_mk_get_statistic_cb cb, void *user_data, on_user_data_free free_cb);
///////////////////////////////////////////日志/////////////////////////////////////////////
diff --git a/api/source/mk_util.cpp b/api/source/mk_util.cpp
index eda27162..e2817161 100644
--- a/api/source/mk_util.cpp
+++ b/api/source/mk_util.cpp
@@ -15,6 +15,9 @@
#include "Util/util.h"
#include "Util/mini.h"
#include "Util/logger.h"
+#include "Util/TimeTicker.h"
+#include "Poller/EventPoller.h"
+#include "Thread/WorkThreadPool.h"
#include "Common/config.h"
using namespace std;
@@ -132,6 +135,129 @@ API_EXPORT void API_CALL mk_ini_dump_file(mk_ini ini, const char *file) {
ptr->dumpFile(file);
}
+extern uint64_t getTotalMemUsage();
+extern uint64_t getTotalMemBlock();
+extern uint64_t getThisThreadMemUsage();
+extern uint64_t getThisThreadMemBlock();
+extern std::vector getBlockTypeSize();
+extern uint64_t getTotalMemBlockByType(int type);
+extern uint64_t getThisThreadMemBlockByType(int type);
+
+namespace mediakit {
+class MediaSource;
+class MultiMediaSourceMuxer;
+class FrameImp;
+class Frame;
+class RtpPacket;
+class RtmpPacket;
+} // namespace mediakit
+
+namespace toolkit {
+class TcpServer;
+class TcpSession;
+class UdpServer;
+class UdpSession;
+class TcpClient;
+class Socket;
+class Buffer;
+class BufferRaw;
+class BufferLikeString;
+class BufferList;
+} // namespace toolkit
+
+API_EXPORT void API_CALL mk_get_statistic(on_mk_get_statistic_cb func, void *user_data, on_user_data_free free_cb) {
+ assert(func);
+ std::shared_ptr data(user_data, free_cb);
+ auto cb = [func, data](const toolkit::mINI &ini) { func(data.get(), (mk_ini)&ini); };
+ auto obj = std::make_shared();
+ auto &val = *obj;
+
+ val["object.MediaSource"] = ObjectStatistic::count();
+ val["object.MultiMediaSourceMuxer"] = ObjectStatistic::count();
+
+ val["object.TcpServer"] = ObjectStatistic::count();
+ val["object.TcpSession"] = ObjectStatistic::count();
+ val["object.UdpServer"] = ObjectStatistic::count();
+ val["object.UdpSession"] = ObjectStatistic::count();
+ val["object.TcpClient"] = ObjectStatistic::count();
+ val["object.Socket"] = ObjectStatistic::count();
+
+ val["object.FrameImp"] = ObjectStatistic::count();
+ val["object.Frame"] = ObjectStatistic::count();
+
+ val["object.Buffer"] = ObjectStatistic::count();
+ val["object.BufferRaw"] = ObjectStatistic::count();
+ val["object.BufferLikeString"] = ObjectStatistic::count();
+ val["object.BufferList"] = ObjectStatistic::count();
+
+ val["object.RtpPacket"] = ObjectStatistic::count();
+ val["object.RtmpPacket"] = ObjectStatistic::count();
+#ifdef ENABLE_MEM_DEBUG
+ auto bytes = getTotalMemUsage();
+ val["memory.memUsage"] = bytes;
+ val["memory.memUsageMB"] = (int)(bytes / 1024 / 1024);
+ val["memory.memBlock"] = getTotalMemBlock();
+ static auto block_type_size = getBlockTypeSize();
+ {
+ int i = 0;
+ string str;
+ size_t last = 0;
+ for (auto sz : block_type_size) {
+ str.append(to_string(last) + "~" + to_string(sz) + ":" + to_string(getTotalMemBlockByType(i++)) + ";");
+ last = sz;
+ }
+ str.pop_back();
+ val["memory.memBlockTypeCount"] = str;
+ }
+#endif
+
+ auto thread_size = EventPollerPool::Instance().getExecutorSize() + WorkThreadPool::Instance().getExecutorSize();
+ std::shared_ptr> thread_mem_info = std::make_shared>(thread_size);
+
+ shared_ptr finished(nullptr, [thread_mem_info, cb, obj](void *) {
+ for (auto &val : *thread_mem_info) {
+ auto thread_name = val["name"];
+ replace(thread_name, "...", "~~~");
+ auto prefix = "thread-" + thread_name + ".";
+ for (auto &pr : val) {
+ (*obj).emplace(prefix + pr.first, std::move(pr.second));
+ }
+ }
+ // 触发回调
+ cb(*obj);
+ });
+
+ auto pos = 0;
+ auto lambda = [&](const TaskExecutor::Ptr &executor) {
+ auto &val = (*thread_mem_info)[pos++];
+ val["load"] = executor->load();
+ Ticker ticker;
+ executor->async([finished, &val, ticker]() {
+ val["name"] = getThreadName();
+ val["delay"] = ticker.elapsedTime();
+#ifdef ENABLE_MEM_DEBUG
+ auto bytes = getThisThreadMemUsage();
+ val["memUsage"] = bytes;
+ val["memUsageMB"] = bytes / 1024 / 1024;
+ val["memBlock"] = getThisThreadMemBlock();
+ {
+ int i = 0;
+ string str;
+ size_t last = 0;
+ for (auto sz : block_type_size) {
+ str.append(to_string(last) + "~" + to_string(sz) + ":" + to_string(getThisThreadMemBlockByType(i++)) + ";");
+ last = sz;
+ }
+ str.pop_back();
+ val["memBlockTypeCount"] = str;
+ }
+#endif
+ });
+ };
+ EventPollerPool::Instance().for_each(lambda);
+ WorkThreadPool::Instance().for_each(lambda);
+}
+
API_EXPORT void API_CALL mk_log_printf(int level, const char *file, const char *function, int line, const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
diff --git a/api/tests/server.c b/api/tests/server.c
index 28f44ada..a61862ed 100644
--- a/api/tests/server.c
+++ b/api/tests/server.c
@@ -189,6 +189,14 @@ static void on_mk_webrtc_get_answer_sdp_func(void *user_data, const char *answer
free((void *)answer);
}
}
+
+void API_CALL on_get_statistic_cb(void *user_data, mk_ini ini) {
+ const char *response_header[] = { NULL };
+ char *str = mk_ini_dump_string(ini);
+ mk_http_response_invoker_do_string(user_data, 200, response_header, str);
+ mk_free(str);
+}
+
/**
* 收到http api请求广播(包括GET/POST)
* @param parser http请求内容对象
@@ -247,6 +255,9 @@ void API_CALL on_mk_http_request(const mk_parser parser,
mk_webrtc_get_answer_sdp(mk_http_response_invoker_clone(invoker), on_mk_webrtc_get_answer_sdp_func,
mk_parser_get_url_param(parser, "type"), mk_parser_get_content(parser, NULL), rtc_url);
+ } else if (strcmp(url, "/index/api/getStatistic") == 0) {
+ //拦截api: /index/api/webrtc
+ mk_get_statistic(on_get_statistic_cb, mk_http_response_invoker_clone(invoker), (on_user_data_free) mk_http_response_invoker_clone_release);
} else {
*consumed = 0;
return;
From 968f6c69c3a0c67bb1ca6fa4d9144b69410b181c Mon Sep 17 00:00:00 2001
From: Lidaofu <746101210@qq.com>
Date: Sun, 19 May 2024 10:34:46 +0800
Subject: [PATCH 13/36] =?UTF-8?q?=E4=BF=AE=E5=A4=8DWindows=E4=B8=8B?=
=?UTF-8?q?=E9=93=BE=E6=8E=A5OpenSSL=E9=9D=99=E6=80=81=E5=BA=93=E7=BC=BA?=
=?UTF-8?q?=E5=B0=91Crypt32=E5=BA=93=E7=9A=84=E9=97=AE=E9=A2=98=20=20(#355?=
=?UTF-8?q?2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: 李道甫
---
CMakeLists.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd0124a9..44e03587 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -403,6 +403,8 @@ if(OPENSSL_FOUND AND ENABLE_OPENSSL)
update_cached_list(MK_LINK_LIBRARIES ${OPENSSL_LIBRARIES})
if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND OPENSSL_USE_STATIC_LIBS)
update_cached_list(MK_LINK_LIBRARIES ${CMAKE_DL_LIBS})
+ elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND OPENSSL_USE_STATIC_LIBS)
+ update_cached_list(MK_LINK_LIBRARIES Crypt32)
endif()
else()
set(ENABLE_OPENSSL OFF)
From 373620cfc6289d504bcf5a01cef62a5f3abda0be Mon Sep 17 00:00:00 2001
From: KkemChen
Date: Thu, 23 May 2024 10:30:11 +0800
Subject: [PATCH 14/36] feat: add broadcast event for player count change
(#3562)
---
conf/config.ini | 2 ++
src/Common/MediaSource.cpp | 4 ++++
src/Common/config.cpp | 3 +++
src/Common/config.h | 6 ++++++
4 files changed, 15 insertions(+)
diff --git a/conf/config.ini b/conf/config.ini
index 89800db2..95d3fa37 100644
--- a/conf/config.ini
+++ b/conf/config.ini
@@ -126,6 +126,8 @@ wait_track_ready_ms=10000
wait_add_track_ms=3000
#如果track未就绪，我们先缓存帧数据，但是有最大个数限制，防止内存溢出
unready_frame_cache=100
+#是否启用观看人数变化事件广播，置1则启用，置0则关闭
+broadcast_player_count_changed=0
[hls]
#hls写文件的buf大小，调整参数可以提高文件io性能
diff --git a/src/Common/MediaSource.cpp b/src/Common/MediaSource.cpp
index 8de8202a..039b156a 100644
--- a/src/Common/MediaSource.cpp
+++ b/src/Common/MediaSource.cpp
@@ -652,6 +652,10 @@ MediaSource::Ptr MediaSource::createFromMP4(const string &schema, const string &
/////////////////////////////////////MediaSourceEvent//////////////////////////////////////
void MediaSourceEvent::onReaderChanged(MediaSource &sender, int size){
+ GET_CONFIG(bool, enable, General::kBroadcastPlayerCountChanged);
+ if (enable) {
+ NOTICE_EMIT(BroadcastPlayerCountChangedArgs, Broadcast::kBroadcastPlayerCountChanged, sender.getMediaTuple(), sender.totalReaderCount());
+ }
if (size || sender.totalReaderCount()) {
//还有人观看该视频，不触发关闭事件
_async_close_timer = nullptr;
diff --git a/src/Common/config.cpp b/src/Common/config.cpp
index 8b7031ae..f2ec0354 100644
--- a/src/Common/config.cpp
+++ b/src/Common/config.cpp
@@ -64,6 +64,7 @@ const string kBroadcastRtcSctpFailed = "kBroadcastRtcSctpFailed";
const string kBroadcastRtcSctpClosed = "kBroadcastRtcSctpClosed";
const string kBroadcastRtcSctpSend = "kBroadcastRtcSctpSend";
const string kBroadcastRtcSctpReceived = "kBroadcastRtcSctpReceived";
+const string kBroadcastPlayerCountChanged = "kBroadcastPlayerCountChanged";
} // namespace Broadcast
@@ -82,6 +83,7 @@ const string kEnableFFmpegLog = GENERAL_FIELD "enable_ffmpeg_log";
const string kWaitTrackReadyMS = GENERAL_FIELD "wait_track_ready_ms";
const string kWaitAddTrackMS = GENERAL_FIELD "wait_add_track_ms";
const string kUnreadyFrameCache = GENERAL_FIELD "unready_frame_cache";
+const string kBroadcastPlayerCountChanged = GENERAL_FIELD "broadcast_player_count_changed";
static onceToken token([]() {
mINI::Instance()[kFlowThreshold] = 1024;
@@ -96,6 +98,7 @@ static onceToken token([]() {
mINI::Instance()[kWaitTrackReadyMS] = 10000;
mINI::Instance()[kWaitAddTrackMS] = 3000;
mINI::Instance()[kUnreadyFrameCache] = 100;
+ mINI::Instance()[kBroadcastPlayerCountChanged] = 0;
});
} // namespace General
diff --git a/src/Common/config.h b/src/Common/config.h
index b10fe685..4b6423a5 100644
--- a/src/Common/config.h
+++ b/src/Common/config.h
@@ -124,6 +124,10 @@ extern const std::string kBroadcastRtcSctpSend;
extern const std::string kBroadcastRtcSctpReceived;
#define BroadcastRtcSctpReceivedArgs WebRtcTransport& sender, uint16_t &streamId, uint32_t &ppid, const uint8_t *&msg, size_t &len
+// 观看人数变化广播
+extern const std::string kBroadcastPlayerCountChanged;
+#define BroadcastPlayerCountChangedArgs const MediaTuple& args, const int& count
+
#define ReloadConfigTag ((void *)(0xFF))
#define RELOAD_KEY(arg, key) \
do { \
@@ -196,6 +200,8 @@ extern const std::string kWaitTrackReadyMS;
extern const std::string kWaitAddTrackMS;
// 如果track未就绪，我们先缓存帧数据，但是有最大个数限制(100帧时大约4秒)，防止内存溢出
extern const std::string kUnreadyFrameCache;
+// 是否启用观看人数变化事件广播，置1则启用，置0则关闭
+extern const std::string kBroadcastPlayerCountChanged;
} // namespace General
namespace Protocol {
From f83e287c774398bda3bb0b7bdc7f46d70b4f4401 Mon Sep 17 00:00:00 2001
From: waken <33921191+mc373906408@users.noreply.github.com>
Date: Thu, 23 May 2024 17:36:56 +0800
Subject: [PATCH 15/36] =?UTF-8?q?=E4=BF=AE=E5=A4=8DC++17=E6=96=B0=E5=BA=93?=
=?UTF-8?q?std::variant=E5=AF=BC=E8=87=B4=E7=9A=84=E7=BC=96=E8=AF=91?=
=?UTF-8?q?=E5=87=BA=E9=94=99=20(#3567)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
server/WebApi.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/WebApi.cpp b/server/WebApi.cpp
index 988b55b5..be1f7a96 100755
--- a/server/WebApi.cpp
+++ b/server/WebApi.cpp
@@ -1766,7 +1766,7 @@ void installWebApi() {
, _session_id(std::move(session_id)) {}
~WebRtcArgsImp() override = default;
- variant operator[](const string &key) const override {
+ toolkit::variant operator[](const string &key) const override {
if (key == "url") {
return getUrl();
}
From 12b71ca41d93a70c80c6b0975a44ae19df7468e1 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sat, 25 May 2024 20:44:58 +0800
Subject: [PATCH 16/36] Update zltoolkit
---
3rdpart/ZLToolKit | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit
index 26d54bbc..1e1a9907 160000
--- a/3rdpart/ZLToolKit
+++ b/3rdpart/ZLToolKit
@@ -1 +1 @@
-Subproject commit 26d54bbc7b1860a450434dce49bbc8fcbcbae88b
+Subproject commit 1e1a990783c6c09452419c0aaa6d72ce02d0202b
From 942458480dcffa922b5cf872809f320ed7a6a5cb Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sat, 25 May 2024 21:16:57 +0800
Subject: [PATCH 17/36] Demangle backtrace function binary symbols when
generated crash logs
---
server/System.cpp | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/server/System.cpp b/server/System.cpp
index 77578924..1e2c8f57 100644
--- a/server/System.cpp
+++ b/server/System.cpp
@@ -22,11 +22,12 @@
#include