amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-24 11:40:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,663 Commits 16 Branches 0 Tags 225 MiB
6518e5d448
Commit Graph

1663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
liuziloong
ee2ca4bda5 Merge branch 'master' into research 2020-01-19 15:09:34 +08:00
liuziloong
d2d84680c0 temp 2020-01-19 14:54:31 +08:00
xiongziliang
cbd6cd4e60 替换不可调试的宏代码 2020-01-17 11:44:20 +08:00
Luke
81d3e54d45 mark 2020-01-16 11:08:15 +08:00
xiongziliang
22d5ec7796 Merge remote-tracking branch 'origin/master' 2020-01-15 20:00:05 +08:00
xiongziliang
95c8474d48 修复GOP缓存相关小bug 2020-01-15 19:59:47 +08:00
夏楚
114d447dac
Merge pull request #215 from gemfield/master 
Split Dockerfile to runtime and devel version
 2020-01-15 15:31:14 +08:00
xiongziliang
caa870c37e websocket服务器支持根据url选择不同的运行逻辑 2020-01-15 15:11:42 +08:00
xiongziliang
34e3e9f720 优化及时推拉流秒开成功率 2020-01-15 11:55:16 +08:00
xiongziliang
2610ba7c8b 修复rtmp注册时还未生成完整config包的bug 2020-01-15 11:46:15 +08:00
xiongziliang
444137e5b7 重写GOP缓存机制 2020-01-15 11:07:55 +08:00
xiongziliang
0a4b59031f 及时推拉流也能确保第一帧为关键帧 2020-01-14 19:41:55 +08:00
Gemfield
5ee913a3bf Split Dockerfile to runtime and devel version, and also reduce the image size for runtime version 2020-01-14 19:36:42 +08:00
xiongziliang
a573d7302b 提高rtsp客户端兼容性 2020-01-14 18:11:10 +08:00
Luke
dad0175094 Merge branch 'master' into research 2020-01-14 11:39:43 +08:00
xiongziliang
2b511a05cc 修复编译问题 2020-01-14 11:21:21 +08:00
Luke
2d9537ec84 snap 2020-01-14 10:36:38 +08:00
xiongziliang
491ed6f83d rtsp不允许覆盖时间戳(pts) 2020-01-14 10:34:05 +08:00
xiongziliang
4a7d17334c rtsp不允许覆盖时间戳(pts) 2020-01-14 10:29:27 +08:00
xiongziliang
d8dbf43490 优化dts生成性能 2020-01-14 10:25:14 +08:00
xiongziliang
ec67900665 优化不含B帧时的dts生成性能 2020-01-14 10:06:35 +08:00
xiongziliang
9fa6e9d8d9 添加dts生成算法，兼容含B帧的rtsp推流 2020-01-14 10:04:24 +08:00
xiongziliang
b55db11de3 解决rtmp过早注册的问题 2020-01-13 15:48:55 +08:00
xiongziliang
66ec67bfb9 1、修复生成的rtmp无法被flash播放的问题 
2、修复RTSP有B帧时，相对时间戳计算异常的问题
 2020-01-13 11:51:29 +08:00
xiongziliang
db146406c3 修复gcc4.85无法编译的问题 2020-01-10 15:29:21 +08:00
xiongziliang
8acb6e2093 修正错误注释 2020-01-09 17:17:48 +08:00
xiongziliang
835d6bd9b5 允许本机和超级用户任意访问http目录 2020-01-09 17:03:29 +08:00
xiongziliang
bad036fdac 添加致谢 2020-01-09 10:06:30 +08:00
xiongziliang
653132b38c 去除多余日志 2020-01-08 14:03:56 +08:00
xiongziliang
ab32ca39a9 去除多余日志 2020-01-08 14:00:53 +08:00
xiongziliang
5d2864cff2 优化DevChannel内存拷贝问题 2020-01-08 12:15:59 +08:00
xiongziliang
57c5d2963a 优化DevChannel内存拷贝问题 2020-01-08 12:14:27 +08:00
xiongziliang
9cdbe4c4ef 修复协议转换配置开关不生效的bug 2020-01-07 15:38:35 +08:00
xiongziliang
5258169a07 修复协议转换配置开关不生效的bug 2020-01-07 15:37:48 +08:00
xiongziliang
09a2623e1b 还原 2020-01-07 15:16:01 +08:00
xiongziliang
16751ddf04 windows支持FFmpeg拉流代理 2020-01-07 15:10:59 +08:00
xiongziliang
77bbc7ae4d Merge remote-tracking branch 'FreeNVR/freenvr' 
# Conflicts:
#	server/FFmpegSource.cpp
#	server/Process.cpp
#	server/Process.h
#	server/System.cpp
 2020-01-07 15:08:15 +08:00
xiongziliang
9c42c5ed8c windows视频FFmpeg拉流代理 2020-01-07 14:37:18 +08:00
刘子龙
5b533354c3 增加todo 2020-01-07 11:17:55 +08:00
Luke
306e202ca1 1.添加windows下ffmpeg拉流分发支持，目前不是很完善，后续再修改 
2.server/system下未兼容完成
 2020-01-07 11:09:11 +08:00
xiongziliang
01bae24fdc update zltoolkit 2020-01-07 10:45:55 +08:00
夏楚
4591ece566
Update README.md 2020-01-06 14:23:23 +08:00
夏楚
3ddb9e4843
Update README.md 2020-01-06 14:19:15 +08:00
xiongziliang
1ce9af35e3 1、复用rtsp url解析代码 
2、修复rtsp/rtmp推流异常回调紊乱的问题
 2020-01-04 12:03:53 +08:00
xiongziliang
e4f9e377c5 修复FFmpeg日志路径相关的bug 2020-01-03 17:26:36 +08:00
xiongziliang
cdba214e79 MP4录制修复兼容性问题 2020-01-03 14:27:26 +08:00
xiongziliang
d482dc1c05 完善http服务器mime类别 2020-01-02 18:24:11 +08:00
xiongziliang
52d831e990 简化hls cookie相关逻辑 2020-01-02 17:46:20 +08:00
xiongziliang
d082955510 合并#199 2020-01-02 16:29:20 +08:00
xiongziliang
bca2472fcd Merge branch 'master' of https://github.com/gemfield/ZLMediaKit 2020-01-02 13:55:02 +08:00