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 |
|
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 |
|
夏楚
|
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 |
|
xiongziliang
|
917763c435
|
修复http头重复的bug
|
2019-07-17 14:50:24 +08:00 |
|
xiongziliang
|
c0a6981662
|
修复android测试程序bug
|
2019-07-16 17:22:45 +08:00 |
|
xiongziliang
|
4122084e05
|
MP4点播绑定固定线程
|
2019-07-11 14:51:40 +08:00 |
|
xiongziliang
|
7adddc361c
|
异步触发kBroadcastStreamNoneReader事件,修复#44
|
2019-07-11 14:38:54 +08:00 |
|
xiongziliang
|
757139312b
|
完善注释
|
2019-07-11 12:15:13 +08:00 |
|
xiongziliang
|
d0d730985f
|
完善rtsp播放器推流udp端口创建机制
|
2019-07-11 12:12:33 +08:00 |
|
xiongziliang
|
6518398aa5
|
修复某些rtsp服务器返回不规范导致兼容性问题
|
2019-07-11 11:53:11 +08:00 |
|