amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-23 11:17:09 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,218 Commits 16 Branches 0 Tags 225 MiB
aef2ae65af
Commit Graph

286 Commits

Author SHA1 Message Date
ziyue
57e91054af 合并日志相关pr: #1077 2021-08-30 20:47:11 +08:00
ziyue
94a6dc66c9 修复生成rtmp包时间戳错误的问题 2021-08-19 19:52:55 +08:00
wxf
a93bba95c1 更新 Toolkit 统一使用 cmake 查到的 ssl 2021-08-16 11:25:14 +08:00
ziyue
da9d3a3b1f 更新ZLToolKit 2021-07-20 21:29:46 +08:00
ziyue
a07addfe38 更新zltoolkit 2021-07-20 21:00:25 +08:00
ziyue
2dcc2c34b2 更新ZLToolKit,提升性能 2021-07-20 20:53:19 +08:00
ziyue
0d48275115 更新zltoolkit库，优化打印日志性能 2021-07-14 21:41:46 +08:00
xiongziliang
eba3758b30 支持设置、获取线程名 2021-07-10 23:54:08 +08:00
xiongziliang
b9e4350dd2 支持线程帮核 2021-07-10 22:02:59 +08:00
xiongziliang
76d6e68ecc 修复windows下编译问题：#978 2021-07-10 19:14:53 +08:00
xiongziliang
9a4c179b0d 修复windows下编译问题：#978 2021-07-10 19:13:54 +08:00
ziyue
59131e3b0a 修复ts/ps解析后组帧逻辑bug：#964 2021-07-07 11:02:36 +08:00
ziyue
0838db5326 修复tcp server循环引用的问题 2021-07-06 10:34:00 +08:00
xiongziliang
4ef1fe2a1f 修复tcp服务器负载均衡机制失效的问题 2021-07-05 22:33:21 +08:00
ziyue
4a6c164d83 更新网络框架,解决负载不够均衡的问题 2021-07-05 21:14:08 +08:00
ziyue
397c1c7c57 整理宏 2021-06-28 20:12:07 +08:00
ziyue
40c1cb239d Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-08 17:52:44 +08:00
ziyue
9c3ec4b4ed 更新zltoolkit,修复Windows下编译问题 2021-06-08 17:45:59 +08:00
ziyue
868fb6e587 更新zltoolkit,修复RtpServer在tcp模式下崩溃的bug 2021-06-08 17:33:23 +08:00
ziyue
edf9129f7e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-08 14:40:51 +08:00
ziyue
c4817c6d5f GB28181单端口接收流支持多线程 2021-06-08 14:03:25 +08:00
ziyue
92736db5b2 适配zltoolkit 2021-06-08 11:29:32 +08:00
ziyue
c3354a3df6 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-05-31 14:18:48 +08:00
ziyue
5eb00d5fab 修复windows下获取errno失败导致崩溃的bug:#889 2021-05-26 16:26:09 +08:00
xiongziliang
9f223bc7a2 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-05-22 10:25:05 +08:00
xiongziliang
8cbec43ee8 合并代码 2021-05-22 09:26:49 +08:00
xiongziliang
259e9dab07 更新ZLToolKit 2021-05-15 09:59:36 +08:00
xiongziliang
0e968a2d5e 更新ZLToolKit 2021-05-12 23:48:13 +08:00
xia-chu
cf520491fa Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-26 19:50:17 +08:00
xia-chu
86afa379c4 更新zltoolkit,修复gcc下编译问题 2021-04-26 19:24:28 +08:00
xia-chu
d005ccf396 更新zltoolkit 2021-04-26 18:24:34 +08:00
xia-chu
48338af700 完善FCI相关代码 2021-04-23 15:06:55 +08:00
xia-chu
31b6dde715 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-20 14:30:34 +08:00
xiongziliang
9004ad7a60 修复老版本openssl编译问题 2021-04-19 19:48:30 +08:00
xiongziliang
f69a23565d Merge remote-tracking branch 'github/master' into dev 2021-04-18 23:13:47 +08:00
xiongziliang
4a6a3746dd 更新ZLToolKit 2021-04-18 23:11:08 +08:00
xiongziliang
5fd23c4cf7 更新ZLToolKit 2021-04-18 21:03:20 +08:00
xiongziliang
77da999394 更新第三方库 2021-04-15 21:45:00 +08:00
xiongziliang
5539050f06 更新第三方库 2021-04-01 21:44:10 +08:00
ziyue
daef7051ad sdp完整性检查，与忽略大小写拼写 2021-03-30 09:53:58 +08:00
ziyue
51ac93a08c rtp超时检测最多暂停5分钟 
更新zltoolkit
 2021-03-16 15:37:34 +08:00
ziyue
d475191dc7 修复过早启动时间戳线程的bug 2021-03-16 10:52:43 +08:00
ziyue
28e6dd9e02 修复过早启动时间戳线程的bug 2021-03-16 10:50:08 +08:00
xiongziliang
daedbed737 更新第三方库 2021-03-07 10:16:39 +08:00
xiongziliang
6548f7959f 更新第三方库 2021-02-28 21:02:55 +08:00
xia-chu
80bcf53ccf 更新ZLToolKit并适配代码 2021-02-06 20:10:34 +08:00
xiongziliang
bba18156ea 更新第三方库，完善fmp4直播:#664 2021-01-31 21:18:08 +08:00
xiongziliang
7745cdb8fc 更新zltoolkit 2021-01-31 20:28:33 +08:00
xiongziliang
bad9553ec4 统计TcpServer个数 2021-01-24 21:59:55 +08:00
xiongziliang
aa45590c13 添加对象统计接口 2021-01-23 09:44:37 +08:00
xia-chu
f63b2b1863 去除编译警告，修复bug 2021-01-19 16:05:38 +08:00
xiongziliang
5d752c89b5 修复编译问题 2021-01-17 20:15:08 +08:00
xia-chu
b6cbc87712 全面整理代码，去除编译警告 2021-01-17 18:31:50 +08:00
xiongziliang
3ff802c2ea 更新ZLToolKit 2021-01-17 10:32:47 +08:00
xiongziliang
97528c2583 更新ZLToolKit 2021-01-09 18:46:09 +08:00
monktan
3ddc14d35d 合并pr(#661): 减少unsport code打印，新增git信息获取 
(cherry picked from commit 47f2f5b349)
 2021-01-02 22:02:23 +08:00
xiongziliang
1397399589 更新zltoolkit 2020-12-13 09:52:16 +08:00
xiongziliang
42679cdf98 更新第三方库，提升GB28281推流兼容性 2020-11-29 09:42:16 +08:00
xiongziliang
6c8f1c9403 更新ZLToolKit，修复bug: #558 2020-11-08 21:42:36 +08:00
xiongziliang
700a16c759 大幅提升接收推流性能以及降低内存占用 2020-11-01 03:41:35 +08:00
xiongziliang
bb5edcb8b4 更新第三方库 2020-10-24 23:33:40 +08:00
xiongziliang
46ee7f369b 防止误删gop缓存 2020-10-20 00:06:59 +08:00
xiongziliang
c9d7cd99a3 修复线程安全相关bug:#521 2020-10-20 11:50:18 +08:00
xiongziliang
51fcaeda4c 更新第三方库 2020-10-18 21:33:36 +08:00
xiongziliang
209689121a 消除编译警告 2020-10-10 18:36:29 +08:00
xiongziliang
dfaa8b540c 使用临时变量和std::move减少智能指针的拷贝构造 2020-10-10 18:23:25 +08:00
xiongziliang
a1de3bfd30 添加流创建时间、在线时间 2020-10-01 18:57:15 +08:00
xiongziliang
4f42f508d5 复用代码 2020-09-26 09:39:38 +08:00
xiongziliang
416d21df36 返回值去除std::move 2020-09-21 14:32:56 +08:00
xiongziliang
ab74a185a0 更新第三方库 2020-09-20 23:27:26 +08:00
xiongziliang
2dd1046131 合并fmp4和mov接口 2020-09-20 19:44:20 +08:00
xiongziliang
3b5053af50 修复关闭HLS后，编译失败的问题 2020-09-12 19:46:58 +08:00
xiongziliang
c711eedaa7 适配ZLToolKit代码,支持自定义创建Socket:#468 2020-09-12 19:03:52 +08:00
xiongziliang
d0f17559cb 更新ZLToolKit 2020-09-06 18:01:47 +08:00
xiongziliang
90622a30fa 更新ZLToolKit 2020-08-30 09:15:50 +08:00
xiongziliang
0456cee336 修复添加aac静音前缀未设置的问题 2020-08-15 09:51:31 +08:00
xiongziliang
d986b1d36c 更新第三方库 2020-08-08 12:23:46 +08:00
xiongziliang
21548e3609 更新ZLToolKit 2020-08-04 17:12:39 +08:00
xiongziliang
76b5e1c3e3 更新ZLToolKit 2020-08-04 15:06:00 +08:00
xiongziliang
8be13c5b5f 更新ZLToolKit 2020-08-04 11:46:29 +08:00
xiongziliang
40e68fa0f5 支持通配符证书 2020-08-03 12:00:23 +08:00
xiongziliang
a9b0ca9cdd hls支持opus 2020-08-01 20:56:34 +08:00
xiongziliang
f84b3d90b4 流未找到事件中，可以立即返回播放失败: #417 2020-07-16 16:00:31 +08:00
xiongziliang
c507e8a772 完善对系统时间戳跳变的支持 2020-07-14 15:03:47 +08:00
xiongziliang
971a4d765d 修复修改系统时间戳导致定时器不精准的bug 2020-07-13 14:38:45 +08:00
xiongziliang
c66e5dcdb1 更新第三方库，修复ps rtp解包相关问题:#388 2020-07-11 21:56:39 +08:00
xiongziliang
80d9f8ccaa 更新ps解析库，兼容不规范的ps流:#359 2020-07-04 21:44:44 +08:00
xiongziliang
cd5dd6ffd0 更新ps解析库，修复猜测编码格式错误的bug:#359 2020-07-04 19:30:03 +08:00
xiongziliang
21edbb0ebe 更新ZLToolKit 2020-07-02 17:44:53 +08:00
xiongziliang
f881108dfe 更新第三方库 2020-06-15 09:13:45 +08:00
xiongziliang
487c993baf 修复select全局限制文件描述符个数的bug:#333 2020-06-08 20:03:51 +08:00
xiongziliang
aca6c18e56 限制select文件描述符个数 2020-06-08 19:21:45 +08:00
xiongziliang
8ef8c91f2e 更新第三方库,解决rtp丢包导致无法解析的问题 2020-06-04 16:17:41 +08:00
xiongziliang
aeb2f910c1 release编译时修复assert宏相关警告 2020-05-30 13:52:09 +08:00
xiongziliang
932da46c3a 更新第三方库 2020-05-30 12:01:44 +08:00
xiongziliang
31ad2caa6b 使用抛异常替代asset，提高代码稳定性 2020-05-30 11:49:36 +08:00
xiongziliang
cca9b1758a 更新ZLToolKit 2020-05-18 15:34:44 +08:00
xiongziliang
2c9141513d ts/ps支持G711 2020-04-26 09:45:00 +08:00
xiongziliang
b2b276029b 修复windows下编译问题 2020-04-24 16:35:41 +08:00
xiongziliang
3cdc0dd98f 更新ZLToolKit 2020-04-24 12:45:21 +08:00