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,648 Commits 16 Branches 0 Tags 224 MiB
02aad5d256
Commit Graph

3648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiongziliang
160b3a67bd Android编译屏蔽openssl 2022-06-19 19:12:43 +08:00
xiongziliang
aacd6416ba 修正多线程编程线程数异常相关问题 2022-06-19 19:11:07 +08:00
xiongziliang
9ab5ea2b36 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-06-19 18:15:58 +08:00
xiongziliang
0eacda5327 新增docker ci并全面整理ci 2022-06-19 18:14:43 +08:00
夏楚
9fd0db55c4
Merge pull request #1730 from Dw9/patch-1 
Update MP4Recorder.cpp
 2022-06-19 18:14:18 +08:00
Dw9
1c5380eead
Update MP4Recorder.cpp 
fix #1679 
_muxer->openMP4 创建非法的文件夹会失败抛出异常  所以_full_path_tmp等都是空字符串
delete_file的时候 就会从此盘符的""(full_path_tmp)目录挨个删除了。 
复现建议新建个盘符...
 2022-06-19 17:27:03 +08:00
xiongziliang
ca66858da2 新增Android ci 2022-06-19 15:38:03 +08:00
custompal
ea53da64ca 同步代码 2022-06-19 14:26:47 +08:00
xiongziliang
67305b1f9f Android工程开启openssl相关功能 2022-06-19 14:09:58 +08:00
xiongziliang
a44b770d9d 完善Android工程 2022-06-19 01:12:14 +08:00
xiongziliang
d30869d0c9 支持获取http反向代理真实客户端ip: #1388 2022-06-18 22:10:46 +08:00
xiongziliang
6291ee704c http文件服务器修复访问安全漏洞 2022-06-18 21:44:16 +08:00
xiongziliang
d5570ad9b3 忽略udp socket的相关错误 2022-06-18 21:27:07 +08:00
xiongziliang
d72af3e61a 兼容不规范的rtsp url: #904 2022-06-18 21:19:26 +08:00
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
custompal
3e62775db7 无人观看定时器指定为MediaSource对象所属poller以确保读取观看数是线程安全的 2022-06-17 18:21:00 +08:00
custompal
260b3ff02c 修复笔误 2022-06-16 19:53:50 +08:00
custompal
7852fdc215 去除rtp_sender_mtx 2022-06-16 19:48:00 +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