amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-01 17:11:31 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,764 Commits 16 Branches 0 Tags 224 MiB
b3ba6d4214
Commit Graph

3764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ziyue
ee15c571e0 更新zltoolkit，修复环形缓冲相关bug 2022-05-17 20:14:33 +08:00
ziyue
e1d4417062 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-05-15 18:02:14 +08:00
ziyue
d9f552ded9 更新zltoolkit 2022-05-15 18:01:25 +08:00
xiongziliang
251fe1f77c 优化随机端口分配逻辑 2022-05-14 23:34:33 +08:00
xiongziliang
8231c5c293 新增GB28181 tcp passive被动发送接口(startSendRtpPassive) 2022-05-14 23:25:22 +08:00
xiongziliang
4f768cacf1 修复编译警告 2022-05-14 18:46:50 +08:00
xiongziliang
b4166d5cfe 修复startSendRtp接口发送ipv4 udp地址失败的bug: #1635 2022-05-14 17:14:38 +08:00
xiongziliang
f1555a5501 防止忽略shutdown事件 2022-05-13 23:54:04 +08:00
xiongziliang
3e869c1f1d 修复https 302 跳转http相关bug 2022-05-13 23:24:17 +08:00
xiongziliang
dd8b4783b7 Merge remote-tracking branch 'origin/master' 2022-05-13 23:22:10 +08:00
xiongziliang
fdbfccb32e hls/http-ts播放器在消费完frame时再触发shutdown事件 2022-05-13 23:22:00 +08:00
夏楚
ed13cc691c
新增metaRTC链接 2022-05-13 22:52:30 +08:00
xiongziliang
d8b99101cf 更新ZLToolKit 2022-05-13 20:48:34 +08:00
xiongziliang
9e6ff0e798 优化头文件引用: #1627 2022-05-13 20:48:22 +08:00
xiongziliang
b0f15c9647 sctp关闭编译时,关闭datachannel相关功能 2022-05-13 20:45:27 +08:00
xiongziliang
3dd3897ad6 新增部分作者 2022-05-13 20:22:19 +08:00
xiongziliang
7e58d91a57 修复rtp two byte ext解析相关bug: #1631 2022-05-13 20:01:57 +08:00
mtdxc
301cbf0a83
支持多个rtc候选地址 (#1622) 
* 支持多个rtc候选地址

* fixed missing extern_ips check
 2022-05-12 15:21:09 +08:00
starry
943deab664
解决CentOS7下Parse.cpp编译不通过问题 (#1627) 
* Update CMakeLists.txt
解决编译不通过问题
 2022-05-12 15:12:13 +08:00
夏楚
845b2ea8d8
!16 增加长期保存hls切片的功能 
增加长期保存hls切片的功能，segKeep=0为不长期保存，segKeep=1为长期保存。此功能部分等效于segNum=0的情况，不同的是这个保留不会在m3u8文件中体现。
 2022-05-11 03:39:59 +00:00
WuPeng
5bc313bafe 增加长期保存hls切片的功能，segKeep=0为不长期保存，segKeep=1为长期保存。此功能部分等效于segNum=0的情况，不同的是这个保留不会在m3u8文件中体现。 2022-05-10 17:32:50 +08:00
ziyue
4c1f0c9b7f 修复Windows下绑定端口可能失败的问题 2022-05-10 17:28:48 +08:00
ziyue
5b51d7cb93 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-05-10 16:49:42 +08:00
ziyue
3c72917ea0 修复bind socket在Windows下失败导致的问题 2022-05-10 16:49:08 +08:00
夏楚
a9d7874467
Update README.md 2022-05-10 15:31:36 +08:00
ziyue
9861091b18 优先使用ipv4地址 2022-05-10 14:48:05 +08:00
ziyue
45494c020b bug fixed 2022-05-10 10:44:12 +08:00
ziyue
d037acbf62 完善ipv6支持 2022-05-08 17:06:10 +08:00
ziyue
a44334acaf 全面支持ipv6 2022-05-08 16:33:33 +08:00
xiongziliang
a95bf960e0 完善ipv6支持 2022-05-08 09:25:47 +08:00
xiongziliang
c14bf7d8b1 修复编译问题 2022-05-08 00:39:52 +08:00
xiongziliang
d66845425c 完善ipv6网络适配 2022-05-08 00:26:01 +08:00
ziyue
3062ea0e7c 初步支持ipv6: #576, #1406 2022-05-07 20:06:08 +08:00
Dw9
5e08e43e9a
webrtc测试网页新增datachannel echo显示框 (#1613) 2022-05-05 16:34:49 +08:00
Xiaofeng Wang
5844b61880
Merge pull request #1607 from Dw9/master 
Update CMakeLists.txt
 2022-05-05 09:38:44 +08:00
xiongziliang
fb003714e9 新增webrtc datachannel功能: #1216 2022-05-04 22:15:21 +08:00
Dw9
d507b76097
Update CMakeLists.txt 2022-05-01 12:19:23 +08:00
ziyue
200a193c04 openRtpServer新增ssrc参数修改为追加至函数末尾, 确保代码逻辑一致无歧义: #1572 2022-04-28 17:44:35 +08:00
ziyue
85399015f9 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-04-28 17:26:05 +08:00
alexliyu7352
c1d2adebae
rtmp拉流的兼容性改进 (#1595) 
* 修复play指令的bug

* 修改MSG_AGGREGATE的时间戳处理逻辑

这里参考了ffmpeg的方式来计算时间戳.

* add bom
 2022-04-28 14:13:09 +08:00
xiongziliang
5e729d6153 溯源集群模式支持边沿服务器选择开启转hls: #1588 2022-04-23 18:40:20 +08:00
夏楚
c31d44d680
Merge pull request #1584 from Dw9/master 
Update CMakeLists.txt
 2022-04-19 19:45:01 +08:00
夏楚
56e72b1191
ci支持pull request 2022-04-19 19:31:22 +08:00
夏楚
d06b4cdd3a
ci支持pull request 2022-04-19 19:30:55 +08:00
夏楚
824f1d2a47
ci支持pull request 2022-04-19 19:30:14 +08:00
Dw9
67bb53746e
Update CMakeLists.txt 2022-04-19 18:07:03 +08:00
Dw9
c82cc587c8
fix typo (#1578) 
fix typo
 2022-04-18 11:48:56 +08:00
xiongziliang
97952bdf0f 更新第三方库，修复mp4录制相关问题：1507 2022-04-16 22:23:26 +08:00
xiongziliang
974055fd17 确保推流器主动断开时，不开启断连续推特性: #1559 2022-04-16 21:37:07 +08:00
Dw9
ebe4141026
c api和测试范例新增webrtc功能 (#1574) 
* Update Rtsp.cpp

* c sdk识别到enable_webrtc

* mk_api增加json库

* 对rtc http请求的处理

* c sdk 增加rtc服务器
 2022-04-16 15:57:02 +08:00