amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-23 03:10:04 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,004 Commits 16 Branches 0 Tags 225 MiB
feature/hls_record_disk
Commit Graph

3004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ziyue
a67246f57e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-16 10:40:17 +08:00
ziyue
d67060e97b mk_media_stop_send_rtp支持关闭单路流 2021-06-16 10:36:53 +08:00
ziyue
14d70426ed 加快GB28181推流时注册速度 2021-06-16 10:26:17 +08:00
ziyue
a09de23271 修复调用mk_media_stop_send_rtp函数导致崩溃的bug 2021-06-16 10:14:24 +08:00
ziyue
4d0db1b7c1 兼容时间戳不规范的H265流：#894 2021-06-15 12:55:55 +08:00
xgj
98d9dcd009 when link ssl with static library add ld link like this cmake .. -DCMAKE_BUILD_TYPE=Release -DOPENSSL_ROOT_DIR=/usr/local/ssl -DOPENSSL_USE_STATIC_LIBS=TRUE 2021-06-11 11:57:55 +08:00
xgj
5b8b5c0ed5 for ssl static link add ld library link 2021-06-11 11:04:43 +08:00
ziyue
24ab876fdb 修复重连时，创建多个mp4解复用器导致内存增长的bug:#895 2021-06-10 14:45:26 +08:00
ziyue
92f879d703 完善PlayerProxy关闭机制,重试次数超限后自动关闭 2021-06-09 15:01:45 +08:00
ziyue
ad2cd11eec 优化判断h265是否为关键帧的代码 2021-06-09 10:19:58 +08:00
baiyfcu
ca192a4286 H265 I帧多slice情况下导致花屏问题 
H265 I帧分片多包情况下，GPO缓冲只保存了I帧最后一个分片导致花屏
 2021-06-09 09:51:28 +08:00
ziyue
b0af056356 删除过多的日志 2021-06-08 21:06:14 +08:00
ziyue
55c2b08c57 rtsp播放器在udp情况下超时时间延长4倍(防止vlc超时) 2021-06-08 20:51:54 +08:00
ziyue
98dc9bc78e ssrc切换时间改为3秒:#899 2021-06-08 20:05:45 +08:00
ziyue
40c1cb239d Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-08 17:52:44 +08:00
ziyue
6ccf512367 完善内存统计 2021-06-08 17:49:12 +08:00
ziyue
9c3ec4b4ed 更新zltoolkit,修复Windows下编译问题 2021-06-08 17:45:59 +08:00
ziyue
868fb6e587 更新zltoolkit,修复RtpServer在tcp模式下崩溃的bug 2021-06-08 17:33:23 +08:00
ziyue
0593f65fcb 完善代码 2021-06-08 14:50:12 +08:00
ziyue
e88281b2ff 删除无效代码 2021-06-08 14:49:48 +08:00
ziyue
89d0a9dedf 屏蔽动态添加配置文件的特性 2021-06-08 14:49:32 +08:00
ziyue
9de39de88c Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev 2021-06-08 14:41:52 +08:00
ziyue
edf9129f7e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-08 14:40:51 +08:00
ziyue
511aa2207f Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit 2021-06-08 14:27:10 +08:00
ziyue
c4817c6d5f GB28181单端口接收流支持多线程 2021-06-08 14:03:25 +08:00
ziyue
92736db5b2 适配zltoolkit 2021-06-08 11:29:32 +08:00
xgj
8721c5a62b for joy4 rtmp push onMetaData compatibility 2021-06-08 10:07:51 +08:00
xgj
bb37bce3ac update zlmrtcclient.js 2021-06-07 18:40:47 +08:00
xgj
0f3a8f4a9d fix webrtc to rtmp multi slice on frame error 2021-06-07 17:32:28 +08:00
xgj
d74779dc02 set server config can dynamic add config for add multi ffmpeg cmd template 2021-06-04 18:06:40 +08:00
baiyfcu
2ee7f67b5b 修复windows set FD 1024未生效BUG#898 2021-05-31 16:51:43 +08:00
ziyue
c3354a3df6 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-05-31 14:18:48 +08:00
ziyue
5eb00d5fab 修复windows下获取errno失败导致崩溃的bug:#889 2021-05-26 16:26:09 +08:00
ziyue
8f62365847 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-05-26 10:43:52 +08:00
夏楚
3b4e7619ad
Merge pull request #865 from yapingcat/master 
fix bug rtcp sr包的 ssrc 和rtp包中ssrc的不一致
 2021-05-22 11:04:50 +08:00
xiongziliang
f034dbf1fa Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit into dev 2021-05-22 10:26:21 +08:00
xiongziliang
9f223bc7a2 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-05-22 10:25:05 +08:00
xiongziliang
975c11b74c 支持http响应无content-length字段的情况:#850 2021-05-22 10:22:56 +08:00
xiongziliang
7067472a18 转协议支持全局关闭音频:#883 2021-05-22 10:17:52 +08:00
xiongziliang
b7e6bfb574 hook接口在http头中附带vhost:#872 2021-05-22 09:53:31 +08:00
xiongziliang
7641db4225 getMediaList等接口返回录制状态:#876 2021-05-22 09:31:59 +08:00
xiongziliang
f54e02f511 修复http文件服务器相关bug 2021-05-22 09:28:19 +08:00
xiongziliang
8cbec43ee8 合并代码 2021-05-22 09:26:49 +08:00
xiongziliang
a391d1e289 修复rtsp推流带参相关的bug:#840 2021-05-22 09:25:24 +08:00
xiongziliang
08d4edddb0 修复http文件服务器相关bug 2021-05-22 09:13:00 +08:00
ziyue
d74589945a 还原 2021-05-19 18:39:23 +08:00
yapingcat
3c49b3737e fix bug rtcp sr包的 ssrc 和rtp包中的一致 2021-05-17 09:20:03 +08:00
xiongziliang
5b57b9d6ae 确保rtc播放不强引用rtsp直播源 2021-05-16 22:13:08 +08:00
xiongziliang
44b0e13ba7 完善打印svc tid 2021-05-16 22:12:26 +08:00
xiongziliang
c6d2b41d97 完善rtp ext相关处理方法 2021-05-16 21:49:46 +08:00