Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
ZLMediaKit
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
张翔宇
ZLMediaKit
Commits
aa45590c
Commit
aa45590c
authored
Jan 23, 2021
by
xiongziliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加对象统计接口
parent
291caf53
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
76 行增加
和
1 行删除
+76
-1
3rdpart/ZLToolKit
+1
-1
postman/ZLMediaKit.postman_collection.json
+32
-0
server/WebApi.cpp
+18
-0
src/Common/MediaSource.cpp
+5
-0
src/Common/MediaSource.h
+2
-0
src/Common/MultiMediaSourceMuxer.cpp
+5
-0
src/Common/MultiMediaSourceMuxer.h
+2
-0
src/Extension/Frame.cpp
+5
-0
src/Extension/Frame.h
+6
-0
没有找到文件。
ZLToolKit
@
6a21c58f
Subproject commit 6
4a61db77b1adeada5e6229b83fec655b1cc09bc
Subproject commit 6
a21c58fa2e21416306c5a9cc88f943b882253e6
postman/ZLMediaKit.postman_collection.json
查看文件 @
aa45590c
...
...
@@ -59,6 +59,32 @@
"response"
:
[]
},
{
"name"
:
"获取主要对象个数(getStatistic)"
,
"request"
:
{
"method"
:
"GET"
,
"header"
:
[],
"url"
:
{
"raw"
:
"{{ZLMediaKit_URL}}/index/api/getStatistic?secret={{ZLMediaKit_secret}}"
,
"host"
:
[
"{{ZLMediaKit_URL}}"
],
"path"
:
[
"index"
,
"api"
,
"getStatistic"
],
"query"
:
[
{
"key"
:
"secret"
,
"value"
:
"{{ZLMediaKit_secret}}"
,
"description"
:
"api操作密钥(配置文件配置),如果操作ip是127.0.0.1,则不需要此参数"
}
]
}
},
"response"
:
[]
},
{
"name"
:
"获取后台线程负载(getWorkThreadsLoad)"
,
"request"
:
{
"method"
:
"GET"
,
...
...
@@ -568,6 +594,12 @@
"key"
:
"enable_mp4"
,
"value"
:
"0"
,
"description"
:
"是否开启mp4录制"
},
{
"key"
:
"ffmpeg_cmd_key"
,
"value"
:
"ffmpeg.cmd_hd"
,
"description"
:
"FFmpeg命名参数模板,置空则采用配置项:ffmpeg.cmd"
,
"disabled"
:
true
}
]
}
...
...
server/WebApi.cpp
查看文件 @
aa45590c
...
...
@@ -1026,6 +1026,24 @@ void installWebApi() {
});
});
api_regist
(
"/index/api/getStatistic"
,[](
API_ARGS_MAP
){
CHECK_SECRET
();
val
[
"data"
][
"MediaSource"
]
=
(
Json
::
UInt64
)(
ObjectStatistic
<
MediaSource
>::
count
());
val
[
"data"
][
"MultiMediaSourceMuxer"
]
=
(
Json
::
UInt64
)(
ObjectStatistic
<
MultiMediaSourceMuxer
>::
count
());
val
[
"data"
][
"TcpSession"
]
=
(
Json
::
UInt64
)(
ObjectStatistic
<
TcpSession
>::
count
());
val
[
"data"
][
"TcpClient"
]
=
(
Json
::
UInt64
)(
ObjectStatistic
<
TcpClient
>::
count
());
val
[
"data"
][
"Socket"
]
=
(
Json
::
UInt64
)(
ObjectStatistic
<
Socket
>::
count
());
val
[
"data"
][
"FrameImp"
]
=
(
Json
::
UInt64
)(
ObjectStatistic
<
FrameImp
>::
count
());
val
[
"data"
][
"Frame"
]
=
(
Json
::
UInt64
)(
ObjectStatistic
<
Frame
>::
count
());
val
[
"data"
][
"Buffer"
]
=
(
Json
::
UInt64
)(
ObjectStatistic
<
Buffer
>::
count
());
val
[
"data"
][
"BufferRaw"
]
=
(
Json
::
UInt64
)(
ObjectStatistic
<
BufferRaw
>::
count
());
val
[
"data"
][
"BufferLikeString"
]
=
(
Json
::
UInt64
)(
ObjectStatistic
<
BufferLikeString
>::
count
());
val
[
"data"
][
"BufferList"
]
=
(
Json
::
UInt64
)(
ObjectStatistic
<
BufferList
>::
count
());
});
////////////以下是注册的Hook API////////////
api_regist
(
"/index/hook/on_publish"
,[](
API_ARGS_MAP
){
//开始推流事件
...
...
src/Common/MediaSource.cpp
查看文件 @
aa45590c
...
...
@@ -14,6 +14,11 @@
#include "Network/sockutil.h"
#include "Network/TcpSession.h"
using
namespace
toolkit
;
namespace
toolkit
{
StatisticImp
(
mediakit
::
MediaSource
);
}
namespace
mediakit
{
recursive_mutex
s_media_source_mtx
;
...
...
src/Common/MediaSource.h
查看文件 @
aa45590c
...
...
@@ -296,6 +296,8 @@ private:
string
_app
;
string
_stream_id
;
std
::
weak_ptr
<
MediaSourceEvent
>
_listener
;
//对象个数统计
ObjectStatistic
<
MediaSource
>
_statistic
;
};
///缓存刷新策略类
...
...
src/Common/MultiMediaSourceMuxer.cpp
查看文件 @
aa45590c
...
...
@@ -11,6 +11,11 @@
#include <math.h>
#include "Common/config.h"
#include "MultiMediaSourceMuxer.h"
namespace
toolkit
{
StatisticImp
(
mediakit
::
MultiMediaSourceMuxer
);
}
namespace
mediakit
{
///////////////////////////////MultiMuxerPrivate//////////////////////////////////
...
...
src/Common/MultiMediaSourceMuxer.h
查看文件 @
aa45590c
...
...
@@ -192,6 +192,8 @@ private:
mutex
_rtp_sender_mtx
;
unordered_map
<
string
,
RtpSender
::
Ptr
>
_rtp_sender
;
#endif //ENABLE_RTPPROXY
//对象个数统计
ObjectStatistic
<
MultiMediaSourceMuxer
>
_statistic
;
};
}
//namespace mediakit
...
...
src/Extension/Frame.cpp
查看文件 @
aa45590c
...
...
@@ -13,6 +13,11 @@
using
namespace
std
;
using
namespace
toolkit
;
namespace
toolkit
{
StatisticImp
(
mediakit
::
Frame
);
StatisticImp
(
mediakit
::
FrameImp
);
}
namespace
mediakit
{
/**
...
...
src/Extension/Frame.h
查看文件 @
aa45590c
...
...
@@ -122,6 +122,10 @@ public:
* 返回可缓存的frame
*/
static
Ptr
getCacheAbleFrame
(
const
Ptr
&
frame
);
private
:
//对象个数统计
ObjectStatistic
<
Frame
>
_statistic
;
};
class
FrameImp
:
public
Frame
{
...
...
@@ -166,6 +170,8 @@ public:
uint32_t
_pts
=
0
;
size_t
_prefix_size
=
0
;
BufferLikeString
_buffer
;
//对象个数统计
ObjectStatistic
<
FrameImp
>
_statistic
;
};
/**
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论