amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-30 07:26:53 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
1,875 Commits 16 Branches 0 Tags 225 MiB
fbd711a6bb
Commit Graph

1062 Commits

Author SHA1 Message Date
xiongziliang
29077dcef4 rtmp播放成功时确保aac track处于ready状态 2020-06-30 21:00:45 +08:00
xiongziliang
41c75fb66a 新增是否开启浏览http目录的配置选项:#367 2020-06-30 09:16:02 +08:00
xiongziliang
bbcb4d41f7 修复ps解析误判为aac的bug 2020-06-29 11:55:13 +08:00
xiongziliang
038979b716 修改rtmp metadata codec由字符为整形,兼容比较老的rtmp服务器 2020-06-28 21:49:08 +08:00
xiongziliang
fd77398291 修复dts计算可能导致不同步的问题：#369 2020-06-28 15:24:08 +08:00
xiongziliang
f67e9fce9a 修复访问悬垂指针的可能 2020-06-28 15:21:41 +08:00
xiongziliang
66c5a7169a 修复metadata中没duration导致播放失败的bug:#362 2020-06-24 11:02:35 +08:00
xiongziliang
e76bc65243 修复开启转协议后，无人观看掐流延时不定期的bug 2020-06-19 10:19:42 +08:00
xiongziliang
5f50441f43 降低第三方库头文件依赖性 2020-06-12 18:17:49 +08:00
xiongziliang
f03351a71a 修改dts生成逻辑 2020-06-11 23:06:01 +08:00
xiongziliang
efa92752c7 完善对高规格aac的支持 2020-06-11 19:21:46 +08:00
xiongziliang
b9006a90d4 优化rtmp推流时，aac config获取不完整的bug 2020-06-11 17:40:09 +08:00
xiongziliang
0e47dc94f9 aac config不再限制两个字节：#336 2020-06-11 17:19:10 +08:00
xiongziliang
7df092074d 修复m3u8起始阶段SEQUENCE错误的bug:#288 2020-06-09 14:21:57 +08:00
xiongziliang
974260156e 防止误报警告日志 2020-05-30 18:33:28 +08:00
xiongziliang
b7049b1407 精简代码 2020-05-30 14:43:08 +08:00
xiongziliang
31ad2caa6b 使用抛异常替代asset，提高代码稳定性 2020-05-30 11:49:36 +08:00
xiongziliang
fb4435fca9 rtp推流解析出frame才刷新保活计时器 2020-05-30 10:16:15 +08:00
xiongziliang
de96a4f0c8 优化代码 2020-05-28 18:19:39 +08:00
xiongziliang
406c5477e0 无metadata且不能获取Track的rtmp确保能注册 2020-05-28 18:01:03 +08:00
xiongziliang
41509800bc 完善对无metadata的rtmp流的兼容性 2020-05-28 17:03:12 +08:00
xiongziliang
0548256c30 合并写缓存优化对rtp的支持 2020-05-27 11:25:56 +08:00
xiongziliang
dea36cfc84 优化合并写逻辑，确保GOP缓存第一帧为关键帧并确保音视频数据的交织性 2020-05-27 11:09:02 +08:00
xiongziliang
a7bcfd566b 平滑动播放hls 2020-05-26 23:19:13 +08:00
xiongziliang
53ca43fb7d 提高性能 2020-05-26 21:04:53 +08:00
xiongziliang
7b90daab24 修复h264/h265 prefixSize计算错误的bug 2020-05-26 17:00:51 +08:00
xiongziliang
7d8dbb2a4b 修复websocket客户端相关bug:#311 2020-05-26 12:11:44 +08:00
xiongziliang
876111698e 优化时间戳相关代码 2020-05-26 10:30:39 +08:00
xiongziliang
ff7914e441 修改MediaSource相关接口 2020-05-26 10:11:58 +08:00
xiongziliang
e063cb3a00 兼容一些不规范的rtsp流 2020-05-25 21:54:43 +08:00
xiongziliang
0626f9a2bf 修复拼写错误 2020-05-25 18:33:42 +08:00
xiongziliang
8d1801339c 优化rtsp鉴权事件 2020-05-25 18:22:21 +08:00
xiongziliang
20d3757986 http-flv/ws-flv先触发on_play再触发on_stream_not_found 2020-05-25 17:38:36 +08:00
xiongziliang
68d910e229 限制rtsp/rtmp推流url合法性 2020-05-25 16:40:41 +08:00
xiongziliang
5ae887a279 websocket客户端销毁时主动发送close信令: #311 2020-05-25 14:36:58 +08:00
xiongziliang
07089ea4e2 websocket协议支持随机掩码 2020-05-25 14:36:07 +08:00
xiongziliang
c20a1337a5 完善rtp丢包日志 2020-05-25 14:28:02 +08:00
xiongziliang
893564d0be 修复拼写错误 2020-05-25 13:51:00 +08:00
xiongziliang
06d61cf195 添加全局时间戳覆盖逻辑 2020-05-25 12:07:38 +08:00
xiongziliang
51a86f502f 完善h264帧split逻辑 2020-05-21 14:10:55 +08:00
xiongziliang
c02438f9c8 hls播放器兼容带参数的url 2020-05-21 14:10:27 +08:00
xiongziliang
3c1e0531de 修复循环引用的问题 2020-05-21 11:44:57 +08:00
xiongziliang
5cc4258ba2 兼容OPTIONS命令返回401、302等命令 2020-05-19 10:47:46 +08:00
xiongziliang
477475a60f 批量添加bom头、批量替换tab字符 2020-05-18 15:31:49 +08:00
xiongziliang
7bc7d95249 hls支持https 2020-05-18 09:24:51 +08:00
xiongziliang
0e26161574 修复hls播放失败不回调的bug 2020-05-17 19:10:08 +08:00
xiongziliang
bab11b426e hls播放器通过测试 2020-05-17 19:06:14 +08:00
xiongziliang
a4aa34e4ae 初步添加hls播放器 2020-05-17 18:00:37 +08:00
xiongziliang
198f223d63 进一步抽象ts/ps解析代码 2020-05-17 18:00:23 +08:00
xiongziliang
cf599167c1 修复指针转换偏移量导致的bug 2020-05-15 21:48:29 +08:00
xiongziliang
be9e31bba2 修复指针转换偏移量导致的bug 2020-05-15 21:39:06 +08:00
xiongziliang
f71a9bfadf 修复rtsp播放器时间戳紊乱的bug 2020-05-15 20:15:43 +08:00
xiongziliang
cded823b65 ps rtp推流优化音视频时间戳同步问题 2020-05-15 18:21:28 +08:00
xiongziliang
1970f6014e 优化音视频同步 2020-05-15 18:08:54 +08:00
xiongziliang
0779a4bee6 完善rtsp 信令心跳包相关逻辑 2020-05-15 09:53:17 +08:00
xiongziliang
d27a8117e1 mp4录制支持opus 2020-05-12 11:48:15 +08:00
xiongziliang
7102b85d67 确保rtp/rtcp端口偶奇约定:#292 2020-05-12 10:37:23 +08:00
xiongziliang
8c46688886 确保rtp/rtcp端口号为偶奇数 2020-05-12 10:22:21 +08:00
xiongziliang
f303ab3222 确保rtp端口为偶数 2020-05-12 09:26:02 +08:00
xiongziliang
4ab270ca10 精简代码 2020-05-11 23:43:28 +08:00
xiongziliang
6356ffcb4f 隐藏细节代码 2020-05-11 23:34:57 +08:00
xiongziliang
70e9a20352 精简aac相关代码 2020-05-11 23:25:12 +08:00
xiongziliang
625d7e30c0 整理和精简代码 2020-05-11 22:33:10 +08:00
xiongziliang
41f1df3acf 可自定义codec 2020-05-11 12:06:15 +08:00
xiongziliang
91080e507c 发送GET_PARAMETER命令兼容一些rtsp服务器:#284 2020-05-09 14:04:08 +08:00
xiongziliang
3252f131ad 修复某些rtp包不兼容的bug 2020-05-08 21:57:56 +08:00
xiongziliang
a4d7b3463e rtmp播放时，取相对时间戳逻辑确保时间戳同步 2020-05-06 18:54:28 +08:00
xiongziliang
920f06a996 AAC sdp添加通道数 2020-04-30 13:35:38 +08:00
xiongziliang
787081eb0c 修复websocket服务器可能存在的bug 2020-04-30 10:31:32 +08:00
xiongziliang
c64d1a3ad8 完善 2020-04-30 10:02:27 +08:00
xiongziliang
b649372873 修复split 264/265相关逻辑的bug 2020-04-30 10:00:55 +08:00
xiongziliang
1067c5a2d3 再优化dts获取 2020-04-29 18:19:51 +08:00
xiongziliang
9d9f6e304e 完善dts计算算法 2020-04-29 18:05:29 +08:00
xiongziliang
3630839bc9 关闭转协议后，将关闭解复用以提供性能 2020-04-29 11:59:45 +08:00
xiongziliang
7e85be7654 添加rtmps服务器 2020-04-29 11:25:15 +08:00
xiongziliang
f9df7f5217 去除ultraLowDelay配置项 2020-04-29 11:08:43 +08:00
xiongziliang
4fbd45e408 h265新增支持两种类型的关键帧 2020-04-29 10:01:56 +08:00
xiongziliang
163b0875cf 修复h264 split后可能多个字节的bug 2020-04-28 22:24:31 +08:00
xiongziliang
7565a20695 startRecord API with "customized_path" #279 2020-04-28 15:24:08 +08:00
xiongziliang
0eb97d5471 修复不能控制录制路径的问题：#279 2020-04-28 09:40:47 +08:00
xiongziliang
75cc34814f 保证不丢帧 2020-04-26 15:19:32 +08:00
xiongziliang
b2fe3cd05d 加锁 2020-04-26 11:25:25 +08:00
xiongziliang
2c9141513d ts/ps支持G711 2020-04-26 09:45:00 +08:00
xiongziliang
f222af2632 完善代码 2020-04-24 15:28:27 +08:00
xiongziliang
e85a8f277e RTMP协议限制G711规格、日志打印codec相关信息 2020-04-24 15:08:28 +08:00
xiongziliang
2e74d5c957 修复合并写相关bug: #282 2020-04-24 13:51:04 +08:00
xiongziliang
b4228f91c3 适配ZLToolKit 2020-04-24 12:39:22 +08:00
xiongziliang
1c03acbdb9 完善网络相关信息 2020-04-23 23:33:58 +08:00
xiongziliang
26cfb5ae73 完善网络相关信息 2020-04-23 23:30:24 +08:00
xiongziliang
0df25942aa rtp推流初步添加事件 2020-04-23 23:18:24 +08:00
xiongziliang
00c21cd99e 优化代码 2020-04-23 22:22:24 +08:00
xiongziliang
eda7a59f3c 统一事件参数类型 2020-04-23 22:04:59 +08:00
xiongziliang
b6946a5968 事件广播触发者改成SockInfo对象 2020-04-23 21:38:44 +08:00
xiongziliang
4d84661a87 更新ZLToolKit 2020-04-23 17:50:12 +08:00
xiongziliang
b09919d374 替换inet_ntoa线程安全版本 2020-04-23 16:14:24 +08:00
xiongziliang
b2e324efdc 完善日志 2020-04-23 15:43:22 +08:00
xiongziliang
2e3cee09bb hls/mp4录像/mp4点播/ts解析/ps解析初步支持G711 2020-04-23 15:19:20 +08:00
xiongziliang
1d5c6cb141 整理解析器 2020-04-20 18:13:45 +08:00
xiongziliang
b7b839a06f 修复编译错误 2020-04-18 23:58:29 +08:00
xiongziliang
49596bd97f 简化接口 2020-04-18 23:56:27 +08:00