amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-10-06 20:23:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,431 Commits 16 Branches 0 Tags 224 MiB
53135131a0
Commit Graph

3431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiongziliang
53135131a0 更新zltoolkit 2022-06-18 21:10:12 +08:00
xiongziliang
2490fd2115 MS_ASSERT改成抛异常 2022-06-18 21:09:57 +08:00
xiongziliang
ba0eaf26fc 时间戳跳变最大阈值调整为3秒 2022-06-18 21:08:34 +08:00
xiongziliang
b351f4c7e5 优化日志提示 2022-06-18 21:06:18 +08:00
xiongziliang
b24c4f8d33 默认禁用编译ffmpeg相关特性 2022-06-18 20:50:25 +08:00
xiongziliang
94839fd93c 添加bom头 2022-06-18 14:34:58 +08:00
xiongziliang
272eca1249 hook重试新增延时功能 2022-06-18 14:10:47 +08:00
xiongziliang
06f5bda8b3 Merge branch 'master' of gitee.com:leon14631/ZLMediaKit 2022-06-18 13:29:14 +08:00
xiongziliang
7f98f9a750 删除重复的获取gmt offset相关代码 2022-06-18 13:27:23 +08:00
xiongziliang
266a0ca5b4 修复test_rtp触发断言的问题 2022-06-18 13:27:15 +08:00
custompal
771844d065
去除rtp_sender_mtx (#1722) 
* 去除rtp_sender_mtx
* 无人观看定时器指定为MediaSource对象所属poller以确保读取观看数是线程安全的

Co-authored-by: xiongziliang <771730766@qq.com>
 2022-06-18 13:22:57 +08:00
xiongguangjie
fda4e83ae4 srt support tlpktdrop=0 feature 2022-06-18 13:01:04 +08:00
monktan
56b8a86032 update submodule 2022-06-16 17:14:12 +08:00
monktan
96bf1c9d79 update submodule 2022-06-16 17:02:30 +08:00
xiongguangjie
fe652e46b4 rtmp session when client stop publish not set push src null avoid judge player or pusher error 2022-06-16 10:57:48 +08:00
xiongguangjie
b22e1cf937 fix g711u or g711a rtp judge error 2022-06-16 10:04:46 +08:00
xiongguangjie
5479820748 const payload type variable start's letter is lower case 2022-06-16 09:59:09 +08:00
Leon
6d701bfef5
update conf/config.ini. 
配置文件HOOK添加retry ，设置hook通知失败重试的次数。默认为0，不重试，
 2022-06-15 07:17:02 +00:00
Leon
01350c810e
update server/WebHook.cpp. 
配置文件HOOK添加retry ，设置hook通知失败重试的次数。默认为0，不重试，
 2022-06-15 07:14:36 +00:00
xiongguangjie
6a337adc91 for rtp server can config pt 2022-06-15 00:20:53 +08:00
xiongguangjie
559b4d3fe7 for srt more check config 2022-06-14 19:49:45 +08:00
ziyue
dfec2d76e0 修复close_stream接口无回复问题 2022-06-14 16:29:04 +08:00
xiongguangjie
4f444203eb Merge remote-tracking branch 'origin/master' into dev 2022-06-13 10:59:25 +08:00
xiongguangjie
b771274a7f fix recv cycle buffer crash and avoid send nak packet exceed mtu 2022-06-12 23:35:30 +08:00
xiongguangjie
6503d95853 add cyclebuffer for recv buf 2022-06-12 21:11:50 +08:00
Xiaofeng Wang
705875f410 添加 dl 依赖库 2022-06-12 18:27:55 +08:00
xiongguangjie
9e18428d7b delay min is 120ms 2022-06-11 23:50:47 +08:00
xiongguangjie
ce7787fe33 force use srt flag 0xbf 2022-06-11 23:11:14 +08:00
xiongguangjie
2e097f13b1 only use periodic NAK 2022-06-11 23:04:24 +08:00
xiongguangjie
4b9f789c79 add srt recv and send packet buf size 2022-06-11 22:51:11 +08:00
xiongguangjie
f8373302d0 change srt streamid like srs srt streamid 2022-06-11 21:37:41 +08:00
xiongziliang
4d6cff36b8 添加bom头 2022-06-11 16:00:45 +08:00
xiongziliang
8fba694473 注释多余代码，消除编译警告 2022-06-11 15:14:14 +08:00
xiongziliang
5688337546 添加utf-bom头 2022-06-11 15:11:03 +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
df7a3242bb 修复获取webrtc推流丢包率除0的bug 2022-06-11 14:23:43 +08:00
xiongziliang
f6b4eb418f 优化录制相关代码 2022-06-11 14:18:55 +08:00
xiongziliang
09af12a183 操作MediaSource对象时确保线程安全 2022-06-11 14:17:43 +08:00
xiongziliang
97116e1208 完善getOwnerPoller相关逻辑 2022-06-11 13:08:58 +08:00
xiongziliang
b6d3ec5251 完善获取丢包率pull request; 新增MediaSource::getOwnerPoller接口 2022-06-11 12:56:03 +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
sha-long-ba-si
3a9408bcec
webrtc answer m-lines次序错误 (#1695) 
Co-authored-by: james <mrjamesli@126.com>
 2022-06-11 12:26:31 +08:00
xiongziliang
483a75284e 修复udp发送失败导致的问题：#1444, #1645 2022-06-11 12:24:33 +08:00
xiongguangjie
49a0183df0 fix clang format change include order result in windows build error 2022-06-09 22:54:24 +08:00
xiongguangjie
f58211fb08 optimize send nack when check packet lost send nack immediately 2022-06-09 19:30:03 +08:00
ziyue
e5ca3aa0fb 格式化代码 2022-06-07 10:01:42 +08:00
ziyue
e415230e47 格式化srt相关代码 2022-06-07 09:52:20 +08:00