xiongziliang
|
e7727e7e9b
|
修复某些流转换hls后花屏的问题
|
2019-08-27 11:34:20 +08:00 |
|
xiongziliang
|
06784d86be
|
完善websocket-flv直播错误响应
|
2019-08-23 09:45:01 +08:00 |
|
xiongziliang
|
1cff946848
|
MediaSource类添加getTracks接口
|
2019-08-22 17:48:10 +08:00 |
|
xiongziliang
|
a451da058c
|
修正mp4录制相关的宏定义
|
2019-08-22 17:46:47 +08:00 |
|
xiongziliang
|
fa030fa0cc
|
简化代码
|
2019-08-22 16:54:30 +08:00 |
|
xiongziliang
|
c6e9f8365d
|
规范类命名
|
2019-08-22 16:25:19 +08:00 |
|
xiongziliang
|
fb1d7dd5a6
|
rtsp推流拉流转发时修整sdp
rtsp推流修整时间戳
|
2019-08-22 16:05:35 +08:00 |
|
xiongziliang
|
bf7363714d
|
完善注释
|
2019-08-22 15:23:14 +08:00 |
|
xiongziliang
|
fc0544512b
|
优化rtmp时间戳修正
|
2019-08-22 14:56:58 +08:00 |
|
xiongziliang
|
113b7842d9
|
http cookie 可以保存更丰富的信息
|
2019-08-20 12:09:43 +08:00 |
|
xiongziliang
|
035a32ec24
|
修复rtp负载长度计算偏差
|
2019-08-20 09:30:39 +08:00 |
|
xiongziliang
|
8ba4c97286
|
修复rtp padding flag可能导致的bug
|
2019-08-20 09:22:13 +08:00 |
|
xiongziliang
|
8453f822b0
|
修复 #66
|
2019-08-19 23:08:41 +08:00 |
|
xiongziliang
|
4b65d9de95
|
新增win32可执行程序
|
2019-08-19 15:46:42 +08:00 |
|
xiongziliang
|
fa60a3c1d8
|
添加mac版本二进制文件
|
2019-08-19 14:59:56 +08:00 |
|
xiongziliang
|
c4f364c487
|
直接代理时sdp清洗后再使用
|
2019-08-15 19:13:31 +08:00 |
|
xiongziliang
|
453994f26b
|
减少内存拷贝,提高websocket服务器性能
|
2019-08-13 12:00:21 +08:00 |
|
xiongziliang
|
9f04062fc5
|
支持websocket(ssl)-flv 直播
|
2019-08-12 18:32:22 +08:00 |
|
xiongziliang
|
8e17300a17
|
初步支持websocket-flv直播
|
2019-08-12 18:14:51 +08:00 |
|
xiongziliang
|
7c7b9e560e
|
统一添加bom
|
2019-08-08 19:01:45 +08:00 |
|
xiongziliang
|
ef61c56cc2
|
优化hls生成
|
2019-08-07 18:24:08 +08:00 |
|
xiongziliang
|
b70d6cd2c2
|
支持修正时间戳
|
2019-08-06 22:54:37 +08:00 |
|
xiongziliang
|
2020e23437
|
兼容某些不规范的sdp
|
2019-08-06 16:23:20 +08:00 |
|
xiongziliang
|
008df0ab85
|
去除继承
|
2019-08-04 23:58:54 +08:00 |
|
xiongziliang
|
f9426c2cfb
|
尝试修复时间戳回环或乱序导致的问题
|
2019-08-02 18:06:37 +08:00 |
|
xiongziliang
|
6a9eb8d54b
|
尝试修复时间戳回环或乱序导致的问题
|
2019-08-02 17:33:31 +08:00 |
|
xiongziliang
|
36803ccedc
|
Merge remote-tracking branch 'origin/master' into zqsong
|
2019-08-02 13:51:34 +08:00 |
|
xiongziliang
|
36ed78ba1f
|
规范函数命名
|
2019-08-02 13:51:24 +08:00 |
|
xiongziliang
|
dd80d6a6bb
|
Merge branch 'dev' of https://github.com/zqsong/ZLMediaKit into zqsong
|
2019-08-02 13:40:15 +08:00 |
|
xiongziliang
|
892734bfd8
|
完善
|
2019-08-02 11:54:05 +08:00 |
|
xiongziliang
|
a400b39fab
|
修复可能丢帧的bug
|
2019-08-02 11:09:17 +08:00 |
|
xiongziliang
|
35c324b6b4
|
修复首帧不是I帧 导致花屏的问题
|
2019-08-02 10:53:00 +08:00 |
zqsong
|
0d57664fac
|
完善H265 sps解析,统一命名风格
|
2019-08-02 10:46:16 +08:00 |
|
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 |
|
xiongziliang
|
2e95c3b2fa
|
修改Rtmp播放结果回调事件触发机制，防止秒开失败以及获取Track失败
|
2019-08-01 13:12:24 +08:00 |
|
zqsong
|
124cce34b6
|
mp4录制全部替换mp4v2为media-server
|
2019-08-01 11:44:16 +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
|
99ab975065
|
h265支持输入复合帧 拆帧代码复用
|
2019-07-30 13:54:19 +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
|
91747947b9
|
优化变量名
|
2019-07-22 18:40:04 +08:00 |
|
xiongziliang
|
cf4482983b
|
统一使用MultiMediaSourceMuxer转协议
|
2019-07-22 18:37: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
|
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
|
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 |
|
xiongziliang
|
5dce8eccde
|
精简代码
|
2019-07-03 16:42:20 +08:00 |
|
xiongziliang
|
e36194aec3
|
完善对pts的支持
|
2019-07-03 16:22:12 +08:00 |
|
xiongziliang
|
818d26aa66
|
添加onRedirectUrl事件
|
2019-07-01 20:55:31 +08:00 |
|
xiongziliang
|
ed78f152ee
|
Http client 302错误码支持
|
2019-07-01 18:35:26 +08:00 |
|
xiongziliang
|
339fdf0de4
|
Http client 302跳转
|
2019-07-01 17:48:09 +08:00 |
|
xiongziliang
|
3c91bf1351
|
Http client支持302跳转
|
2019-07-01 17:39:16 +08:00 |
|
xiongziliang
|
67f7c3dc8f
|
http客户端支持302跳转
修复HttpRequestSplitter可能内存越界的bug
|
2019-07-01 09:53:58 +08:00 |
|
xiongziliang
|
7aa0c2ae33
|
整理优化代码
|
2019-06-28 17:37:11 +08:00 |
|
xiongziliang
|
0b08831f5d
|
整理优化代码
|
2019-06-28 17:30:13 +08:00 |
|
xiongziliang
|
ea131d9740
|
整理优化代码
|
2019-06-28 17:25:53 +08:00 |
|
xiongziliang
|
27ce8a9915
|
整理优化代码
|
2019-06-28 16:55:28 +08:00 |
|
xiongziliang
|
bf39cf3e33
|
整理优化代码
|
2019-06-28 16:48:02 +08:00 |
|
xiongziliang
|
0a2c022fa8
|
优化代码
|
2019-06-28 16:12:39 +08:00 |
|
xiongziliang
|
034dbbf7ba
|
修复rtp打洞包相关的bug
|
2019-06-27 12:53:35 +08:00 |
|
xiongziliang
|
585201ece1
|
修复接收rtsp推流的兼容性问题
|
2019-06-27 12:21:01 +08:00 |
|
xiongziliang
|
d250e1b7ec
|
整理代码
|
2019-06-26 10:01:04 +08:00 |
|
xiongziliang
|
18a0691448
|
优化代码
|
2019-06-24 17:01:15 +08:00 |
|
xiongziliang
|
85f05adc06
|
优化代码，提升可读性
|
2019-06-24 16:56:46 +08:00 |
|
xiongziliang
|
9039f8c1f6
|
支持超大rtp包
|
2019-06-24 16:07:44 +08:00 |
|
xiongziliang
|
bede5500c8
|
修复Windows上的编译问题
|
2019-06-15 16:33:12 +08:00 |
|
xiongziliang
|
71f020dabc
|
修复http文件鉴权bug
|
2019-06-14 21:33:41 +08:00 |
|
xiongziliang
|
5c3092db51
|
代码优化
|
2019-06-14 18:51:50 +08:00 |
|
xiongziliang
|
790daee5ad
|
精简代码
|
2019-06-14 18:47:28 +08:00 |
|
xiongziliang
|
c7cc082d95
|
http文件鉴权支持自定义错误提示
|
2019-06-14 18:42:09 +08:00 |
|
xiongziliang
|
cfbdda0698
|
url参数变更后再次鉴权；hls播放鉴权提到httpsession类中实现
|
2019-06-14 15:19:02 +08:00 |
|
xiongziliang
|
e365824be2
|
修复multimap导致重复http头的bug
|
2019-06-13 18:39:57 +08:00 |
|
xiongziliang
|
42fe7e3dc5
|
服务器cookie不再强制关联path
|
2019-06-13 12:00:41 +08:00 |
|
xiongziliang
|
23d793c9c2
|
http客户端支持多cookie
|
2019-06-13 11:45:13 +08:00 |
|
xiongziliang
|
4662c1feb0
|
cookie过期时间为0时仅限本次访问鉴权
|
2019-06-13 09:24:53 +08:00 |
|
xiongziliang
|
20e62b103a
|
添加用户追踪事件
|
2019-06-12 18:55:23 +08:00 |
|
xiongziliang
|
080f2af4b4
|
常量改成string ，提供性能
|
2019-06-12 18:37:52 +08:00 |
|
xiongziliang
|
555601506b
|
添加访问http目录权限事件
|
2019-06-12 17:53:48 +08:00 |
|
xiongziliang
|
ce9a9188b2
|
优化rtsp服务器性能
|
2019-06-11 18:31:34 +08:00 |
|
xiongziliang
|
826f3649ea
|
更新ZLToolK(修复linux下编译问题)
|
2019-06-11 12:28:48 +08:00 |
|
xiongziliang
|
c876c43374
|
优化代码
|
2019-06-10 12:33:45 +08:00 |
|
xiongziliang
|
c454240c83
|
完善事件取消监听机制
|
2019-06-06 15:29:36 +08:00 |
|
xiongziliang
|
7bb1b7f670
|
修正注释
|
2019-06-03 16:10:36 +08:00 |
|
xiongziliang
|
c0f41167ba
|
创建Socket优先绑定本线程
|
2019-05-31 18:01:38 +08:00 |
|
xiongziliang
|
f5a80e3799
|
onNoneReader事件避免重复触发
|
2019-05-31 15:40:55 +08:00 |
|
xiongziliang
|
2b86082f3d
|
修复FFmpeg无法播放rtsp over http的问题
|
2019-05-31 10:16:31 +08:00 |
|
xiongziliang
|
0428507509
|
添加头文件宏
|
2019-05-31 09:06:30 +08:00 |
|
xiongziliang
|
c38521aa0e
|
修复编译bug
|
2019-05-30 16:03:06 +08:00 |
|
xiongziliang
|
db0611de91
|
修复rtsp注册前未设置sdp的bug
rtsp鉴权放置在查找流之前，防止无谓的按需拉流
|
2019-05-30 16:01:56 +08:00 |
|
xiongziliang
|
6d08e2a243
|
完善rtmp服务器错误提示
|
2019-05-30 12:17:26 +08:00 |
|
xiongziliang
|
042981c4e4
|
完善rtsp服务器错误提示
|
2019-05-30 12:14:20 +08:00 |
|
xiongziliang
|
c8b192fa6e
|
完善http错误提示
|
2019-05-30 10:59:14 +08:00 |
|
xiongziliang
|
0c460b397d
|
发送超时时间可配置
|
2019-05-30 10:41:25 +08:00 |
|
xiongziliang
|
e9e21e11a2
|
rtsp/rtmp超时时间可配置
|
2019-05-29 18:24:35 +08:00 |
|
xiongziliang
|
a39c4c1344
|
完善错误提示
|
2019-05-29 18:08:50 +08:00 |
|
xiongziliang
|
f8f3c5dd19
|
优化虚拟主机相关
|
2019-05-29 09:30:39 +08:00 |
|
xiongziliang
|
d0deea8b58
|
优化虚拟主机相关
|
2019-05-29 09:28:35 +08:00 |
|
xiongziliang
|
a109d966c8
|
优化虚拟主机相关
|
2019-05-29 09:26:16 +08:00 |
|
xiongziliang
|
c1b6df7bc7
|
优化虚拟主机相关
|
2019-05-29 09:24:02 +08:00 |
|
xiongziliang
|
458a92521f
|
完善服务器日志打印
|
2019-05-28 18:46:52 +08:00 |
|
xiongziliang
|
69624f84ac
|
完善设置项注释
|
2019-05-28 17:27:28 +08:00 |
|
xiongziliang
|
a100ee0acd
|
支持全局的禁用虚拟主机
|
2019-05-28 17:14:36 +08:00 |
|
xiongziliang
|
2f976214ce
|
修复media命令相关bug
|
2019-05-28 10:02:12 +08:00 |
|
xiongziliang
|
94ccd27f47
|
等待流注册时间可配置化
|
2019-05-28 09:25:41 +08:00 |
|
xiongziliang
|
72581cf415
|
bug fixed
|
2019-05-27 22:51:16 +08:00 |
|
xiongziliang
|
29e4a6b14a
|
http-flv支持延时注册流
|
2019-05-27 22:49:30 +08:00 |
|
xiongziliang
|
0dc7cbb879
|
精简等待监听流异步注册后回复事件相关代码
|
2019-05-27 22:32:07 +08:00 |
|
xiongziliang
|
eabb673005
|
无人观看延时关闭
|
2019-05-27 21:37:29 +08:00 |
|
xiongziliang
|
5b88057a89
|
添加无人观看主动断开事件
|
2019-05-27 18:41:37 +08:00 |
|
xiongziliang
|
b0bf216bc2
|
添加无人观看主动断开事件
|
2019-05-27 18:39:43 +08:00 |
|
xiongziliang
|
3917b6451c
|
完善获取媒体读取器个数方法
|
2019-05-27 16:09:29 +08:00 |
|
xiongziliang
|
f563274cda
|
完善主动关断流机制
|
2019-05-27 14:14:42 +08:00 |
|
xiongziliang
|
3e54018409
|
删除重复代码
|
2019-05-27 12:13:27 +08:00 |
|
xiongziliang
|
c857968f40
|
flv录制延时两秒启动，防止收集config帧不齐
|
2019-05-27 10:58:08 +08:00 |
|
xiongziliang
|
ce7a0223f1
|
动态代理拉流等待拉流结果
|
2019-05-20 18:08:55 +08:00 |
|
xiongziliang
|
fbead02868
|
流量统计添加isPlayer参数
|
2019-05-20 17:46:06 +08:00 |
|
xiongziliang
|
74d074ac53
|
完善Hook与API
|
2019-05-20 16:26:04 +08:00 |
|
xiongziliang
|
2f6773f180
|
添加完整的服务器用例
|
2019-05-20 11:22:59 +08:00 |
|
xiongziliang
|
2217211464
|
rtp组播监听组播地址
更新ZLToolKit
|
2019-05-20 09:43:13 +08:00 |
|
xiongziliang
|
2a8b6d2b84
|
删除冗余代码
|
2019-05-16 17:56:36 +08:00 |
|
xiongziliang
|
609006d06e
|
性能优化
|
2019-05-16 17:34:38 +08:00 |
|
xiongziliang
|
28d20955e0
|
http服务器支持查找index.html文件
|
2019-05-16 17:31:48 +08:00 |
|
xiongziliang
|
4c39821691
|
添加http服务器配置项:是否支持vhost
|
2019-05-16 17:09:29 +08:00 |
|
xiongziliang
|
35734f9e27
|
sps pps vps帧不再缓存
|
2019-05-13 14:17:55 +08:00 |
|
xiongziliang
|
a88531354a
|
提升rtp组播线程安全性
|
2019-05-13 09:36:23 +08:00 |
|
xiongziliang
|
db1e850ef3
|
修复rtsp over http的bug
|
2019-05-10 18:40:30 +08:00 |