amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 04:31:37 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,685 Commits 16 Branches 0 Tags 225 MiB
c25e93fee3
Commit Graph

406 Commits

Author SHA1 Message Date
xiongziliang
c25e93fee3 解决启动ffmpeg进程导致shell终端假死的问题：#1662 2022-10-29 17:44:55 +08:00
ziyue
7d251e15b3 on_publish hook兼容非标准回复 2022-10-20 11:00:19 +08:00
ziyue
eac5a5b1dc 使用submodule方式添加jsoncpp源码 2022-10-16 21:10:18 +08:00
xiongziliang
a916760ac3 整理webrtc c接口 2022-10-06 12:35:14 +08:00
Dw9
43bf7c7918 c api support srt server 2022-09-22 21:18:34 +08:00
ziyue
0b355759de 整理webrtc相关代码命名空间 2022-09-18 21:03:05 +08:00
ziyue
15affeff1d 优化关闭媒体源相关逻辑: #1963 2022-09-18 20:36:47 +08:00
xiongziliang
12551be33c 提炼ProtocolOption赋值相关逻辑 2022-09-16 23:31:37 +08:00
夏楚
4a35ddbddb
Merge pull request #1942 from mtdxc/reduce_code 
简化代码
 2022-09-09 11:10:55 +08:00
custompal
d853075175
RtpServer新增tcp主动模式支持 (#1938) 2022-09-09 10:56:28 +08:00
huangxiuqi
258a4dd166
C API和WebHook未找到流回调添加直接关闭机制 (#1948) 2022-09-09 10:55:35 +08:00
cqm
999e0b274e 简化代码: 
- MediaSource引入shortUrl和getUrl来简化日志输出
- WebApi引入fillSockInfo
 2022-09-07 11:47:15 +08:00
xiongziliang
00c9749b5d 防止多个track时获取rtp推流丢包率失败 2022-09-03 16:47:37 +08:00
PioLing
0948a3df31
支持在addStreamProxy和on_publish中控制单个流是否开启时间戳覆盖 (#1930) 2022-09-03 09:54:09 +08:00
custompal
dd6495cc07 补充getMediaPlayerList接口注释及postman示例 2022-09-02 17:46:09 +08:00
custompal
33e1e6b88d getMediaPlayerList返回播放器id以及会话类型名称 2022-09-01 21:52:43 +08:00
custompal
d0214a13e1 防止getPlayerList返回的json数据为null 2022-09-01 17:45:06 +08:00
custompal
38170c702e 修正gcc4.8编译错误 2022-09-01 17:33:36 +08:00
custompal
04aa3ef41f 增加获取媒体流播放器列表功能 2022-08-30 21:05:19 +08:00
xiongziliang
6a4297845f 新增发送rtp被动关闭hook 2022-08-27 10:53:47 +08:00
xiongziliang
9f0c15a4f0 startSendRtp接口支持rtcp接收超时主动停止 2022-08-20 12:48:27 +08:00
Dw9
30984d2076
mp4录制支持作为观看者参与播放人数统计 (#1880) 2022-08-16 11:47:24 +08:00
xiongguangjie
a1000da71f add get version restful api 2022-08-12 18:09:44 +08:00
ziyue
35791aac89 优化代码，去除编译警告，修复拼写错误 2022-08-08 17:36:07 +08:00
ziyue
7458a67c66 修正deleteRecordDirectory接口拼写错误并精简代码 2022-08-05 16:01:31 +08:00
Dw9
73d2cd4ff7 修复pr1885 删除文件判断逻辑错误 2022-08-04 22:00:44 +08:00
dreamisdream
db70aec690
增加webapi deleteRecordDirectroy(删除录像文件夹) (#1851) 2022-08-04 10:15:07 +08:00
ziyue
54f400a6e9 确保MediaServer主函数可以多次调用: #1838 2022-07-29 16:24:43 +08:00
Xiaofeng Wang
310b60276c cmake: try to disable compile warning of C4819 2022-07-26 13:25:36 +08:00
Xiaofeng Wang
8f679831bc camke: fix server compile definitions 2022-07-26 13:23:58 +08:00
Xiaofeng Wang
0fb0cc29e5 设置依赖以便推导编译依赖 2022-07-26 00:17:59 +08:00
Xiaofeng Wang
9d3ead61de 整理 CMakeLists.txt 2022-07-25 00:22:30 +08:00
Xiaofeng Wang
8192b37cd4 修正 ENABLE_RTPPROXY 的处理 2022-07-24 22:30:59 +08:00
custompal
1291bf1d21 添加bom头 2022-07-15 20:01:00 +08:00
custompal
d3b37b76bd getMp4RecordFile接口可使用自定义的录像保存根目录来搜索文件 2022-07-15 19:53:10 +08:00
baiyfcu
fde6b436cc 封装rtp server创建和关闭 2022-06-22 10:31:53 +08:00
xiongziliang
a44b770d9d 完善Android工程 2022-06-19 01:12:14 +08:00
xiongziliang
272eca1249 hook重试新增延时功能 2022-06-18 14:10:47 +08:00
Leon
01350c810e
update server/WebHook.cpp. 
配置文件HOOK添加retry ，设置hook通知失败重试的次数。默认为0，不重试，
 2022-06-15 07:14:36 +00:00
ziyue
dfec2d76e0 修复close_stream接口无回复问题 2022-06-14 16:29:04 +08:00
xiongziliang
4d6cff36b8 添加bom头 2022-06-11 16:00:45 +08:00
xiongziliang
fd11c53a78 Merge branch 'feature/srt' of github.com:ZLMediaKit/ZLMediaKit 2022-06-11 15:07:58 +08:00
xiongziliang
84d0d1db19 getAllSession接口返回完整可读类名 2022-06-11 15:03:28 +08:00
xiongziliang
926e78272c 优化获取丢包率相关代码 2022-06-11 14:45:56 +08:00
xiongziliang
974428d1e7 确保获取丢包率时线程安全 2022-06-11 14:40:14 +08:00
xiongziliang
09af12a183 操作MediaSource对象时确保线程安全 2022-06-11 14:17:43 +08:00
Leon
be995f9cd2 !17 【功能请求】 /index/api/getMediaList接口 增加LOSS字段用于统计每个轨道丢包率反馈 
* update webrtc/WebRtcPusher.h.
* update webrtc/WebRtcPusher.cpp.
* update webrtc/WebRtcTransport.h.
* update webrtc/WebRtcTransport.cpp.
* update src/Common/MediaSource.h.
* update src/Common/MediaSource.cpp.
* update server/WebApi.cpp.
 2022-06-11 04:31:06 +00:00
xiongguangjie
89b135400c Merge remote-tracking branch 'origin/master' into feature/srt 2022-06-04 15:47:47 +08:00
xiongziliang
b23cbaa0f8 on_publish hook新增continue_push_ms参数，用于断连续推延时控制 2022-06-04 11:06:35 +08:00
xiongguangjie
aa2ff01d9f first commit for srt intergrate 2022-06-03 13:25:32 +08:00