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
1,115 Commits 16 Branches 0 Tags 225 MiB
644905a374
Commit Graph

1115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiongziliang
1f89019818 写mp4文件缓存可配置 2019-08-01 22:13:26 +08:00
xiongziliang
13a6d3ac16 完善写mp4文件 2019-08-01 22:07:40 +08:00
xiongziliang
6c0d89f417 修复生成mp4相关bug 2019-08-01 21:59:26 +08:00
xiongziliang
6d8db7d232 修复bug 2019-08-01 19:09:14 +08:00
xiongziliang
383a14a76d 重新mp4录制 2019-08-01 18:49:04 +08:00
xiongziliang
12e1068a39 Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit into zqsong 2019-08-01 14:53:59 +08:00
xiongziliang
e13ae419ae 精简H264Frame对象，删除多余字段 2019-08-01 14:39:09 +08:00
xiongziliang
69098612bc Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit into zqsong 2019-08-01 14:06:34 +08:00
baiyfcu
ad83b39b0f
Merge pull request #3 from zlmediakit/master 
update
 2019-08-01 13:27:56 +08:00
xiongziliang
2e95c3b2fa 修改Rtmp播放结果回调事件触发机制，防止秒开失败以及获取Track失败 2019-08-01 13:12:24 +08:00
xiongziliang
fcdcf12af9 更新ZLToolKit 修好GOP缓存不够导致秒开失败的bug 2019-08-01 13:06:54 +08:00
zqsong
776dd4c085 恢复CMakeLists.txt 2019-08-01 11:47:30 +08:00
zqsong
124cce34b6 mp4录制全部替换mp4v2为media-server 2019-08-01 11:44:16 +08:00
xiongziliang
45b5da0977 恢复日志 2019-07-31 17:51:53 +08:00
zqsong
7e92a0b738 MP4录制添加H265支持 2019-07-30 21:29:31 +08:00
zqsong
360eba2c68 MP4录制添加H265支持 2019-07-30 19:26:38 +08:00
xiongziliang
fbf0469ef2 完善跨域支持 2019-07-30 16:07:51 +08:00
xiongziliang
2068c873a5 完善跨域支持 2019-07-30 16:07:00 +08:00
xiongziliang
d01fc3a383 Merge remote-tracking branch 'origin/master' 2019-07-30 13:54:31 +08:00
xiongziliang
99ab975065 h265支持输入复合帧 拆帧代码复用 2019-07-30 13:54:19 +08:00
baiyfcu
16db003434
Merge pull request #2 from zlmediakit/master 
update
 2019-07-30 09:52:08 +08:00
baiyfcu
3efea46c5e 使用CMAKE_CURRENT_SOURCE_DIR代替CMAKE_SOURCE_DIR,方便嵌入其它cmake工程 2019-07-30 09:49:29 +08:00
夏楚
1e3591becc
Update README_CN.md 2019-07-29 23:58:13 +08:00
夏楚
5457d73ecc
Update README.md 2019-07-29 23:57:30 +08:00
xiongziliang
d507220869 Merge remote-tracking branch 'origin/master' 2019-07-29 23:54:49 +08:00
xiongziliang
5985ff4567 新增logo 2019-07-29 23:54:30 +08:00
夏楚
e55108de4f
Update README_CN.md 2019-07-29 14:04:55 +08:00
xiongziliang
e27e7bed4d 合并#57 2019-07-28 20:55:37 +08:00
baiyfcu
20ca0f76cd 修复test_player windows编译错误 2019-07-26 22:56:17 +08:00
baiyfcu
2d16e39445
Merge pull request #1 from zlmediakit/master 
update
 2019-07-26 13:36:30 +08:00
xiongziliang
66dc9c43be 修复windows下编译问题 2019-07-26 09:10:27 +08:00
xiongziliang
9640d8e33d 回复代码，防止兼容性问题 2019-07-25 12:18:17 +08:00
xiongziliang
6922d82c65 rtmp解复用支持无内存拷贝 
hls生成支持输入无0x 00 00 01的H264/H265数据
 2019-07-25 12:09:36 +08:00
xiongziliang
d2a889b463 优化类命名以及添加注释 2019-07-25 09:38:16 +08:00
xiongziliang
7baa35e594 修复hls由于缓存导致花屏的问题 2019-07-24 18:40:18 +08:00
xiongziliang
f50eaf8648 Frame添加cacheAbel接口 2019-07-24 18:02:55 +08:00
xiongziliang
2d460ff83d 更新ZLToolKit(防止错误获取WorkThread中的线程) 2019-07-24 14:14:46 +08:00
xiongziliang
91747947b9 优化变量名 2019-07-22 18:40:04 +08:00
xiongziliang
cf4482983b 统一使用MultiMediaSourceMuxer转协议 2019-07-22 18:37:32 +08:00
xiongziliang
46f5a853ac 适配最新代码 2019-07-22 11:39:51 +08:00
xiongziliang
bdf515561a 完善addStreamProxy接口注释 2019-07-22 11:38:32 +08:00
xiongziliang
3ca699721e PlayerProxy、DevChannel、MultiMediaSourceMuxer类支持是否开启rtsp/rtmp功能 
addStreamProxy增加enable_rtsp、enable_rtmp参数
 2019-07-22 11:27:17 +08:00
xiongziliang
3c8f96f2a1 添加rtsps rtmps客户端支持 2019-07-20 20:53:50 +08:00
xiongziliang
1c89c60963 fixed #51 2019-07-20 20:37:52 +08:00
xiongziliang
ee8edb8ba8 完善注释 2019-07-19 11:58:23 +08:00
xiongziliang
9c0fb9e676 添加配置项:是否直接rtsp拉流代理 2019-07-19 11:54:29 +08:00
xiongziliang
d71f1dd293 本协议拉流代码支持任意编码格式 2019-07-19 11:30:39 +08:00
xiongziliang
e095a604ab 更新ssrc生成规则 2019-07-19 09:42:48 +08:00
xiongziliang
8bbd9d57c0 更改ssrc生成规则 2019-07-17 15:23:54 +08:00
xiongziliang
ff34b937f3 修复http头重复的bug 2019-07-17 14:54:14 +08:00