amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-10-06 20:23:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,362 Commits 16 Branches 0 Tags 224 MiB
926e78272c
Commit Graph

361 Commits

Author SHA1 Message Date
ziyue
9de39de88c Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev 2021-06-08 14:41:52 +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
92736db5b2 适配zltoolkit 2021-06-08 11:29:32 +08:00
xgj
d74779dc02 set server config can dynamic add config for add multi ffmpeg cmd template 2021-06-04 18:06:40 +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
b7e6bfb574 hook接口在http头中附带vhost:#872 2021-05-22 09:53:31 +08:00
xiongziliang
7641db4225 getMediaList等接口返回录制状态:#876 2021-05-22 09:31:59 +08:00
xia-chu
6292824e34 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-30 18:05:48 +08:00
xia-chu
af59fdeb86 addStreamProxy接口支持超时参数 2021-04-30 18:01:48 +08:00
xiongziliang
9e93561c77 只有linux平台打开链接顺序无关选项 2021-04-11 11:53:05 +08:00
xiongziliang
5fadd2665d 非windows平台，才忽略静态库链接顺序 2021-04-11 11:44:16 +08:00
xiongziliang
bbe67e928e Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev 2021-04-11 11:42:45 +08:00
xiongziliang
e094a0bcae Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-04-11 11:41:27 +08:00
xiongziliang
271b180004 修复流注册事件track和regist字段缺失的bug 2021-04-11 11:39:49 +08:00
xgj
ebf650cf4f fix static library link order 2021-04-10 22:24:26 +08:00
xiongziliang
b180ea0609 删除测试代码 2021-04-09 20:42:05 +08:00
xia-chu
38894097ae Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-04-09 10:47:14 +08:00
xia-chu
67e1b1f194 媒体注册hook添加编码等信息 2021-04-08 17:34:46 +08:00
xia-chu
a22a6bafb7 添加流量统计事件 2021-04-07 18:35:38 +08:00
xia-chu
0c5fa36e4d rtc推流添加媒体事件相关接口 2021-04-07 18:18:27 +08:00
xia-chu
b96052d387 完善rtc异常管理 2021-04-07 17:51:47 +08:00
xiongziliang
50ca789c0c 预留同时推流拉流的接口 2021-04-05 11:32:38 +08:00
xiongziliang
fe02f2cf1c rtc推流和播放添加事件触发 2021-04-04 23:20:10 +08:00
ziyue
33d2e71368 合并代码，去除冗余代码 2021-04-02 16:23:40 +08:00
xiongziliang
9a26ba9f8a 修复android下编译问题 2021-04-01 20:14:07 +08:00
ziyue
7e5cb33395 开始对接js 2021-03-31 17:15:26 +08:00
ziyue
45b8f83131 删除测试代码 2021-03-30 13:53:45 +08:00
ziyue
9d2498a694 candidate foundation改为string类型 2021-03-29 12:28:47 +08:00
ziyue
272ab706b0 确保安全释放资源 2021-03-27 10:18:03 +08:00
ziyue
bdf2783a6b 还原原始文件名 2021-03-27 10:18:03 +08:00
ziyue
704421b728 完善 2021-03-26 18:22:19 +08:00
ziyue
65e470e060 初步添加rtsp转webrtc相关功能 2021-03-25 16:01:54 +08:00
ziyue
060b654252 修改rtp超时检测相关http api,rtp超时检测最多暂停5分钟 2021-03-16 11:31:41 +08:00
xiongziliang
a0fc494ee3 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit 2021-03-14 10:34:33 +08:00
xiongziliang
be8403c31c 完善代码 2021-03-14 10:29:17 +08:00
sunhui
ce80edffd2 增加支持TCP暂停 2021-03-11 10:05:53 +08:00
xiongziliang
c0f4899950 录制接口支持指定切片时间大小:#747 2021-03-07 10:41:57 +08:00
xia-chu
0c728827aa 添加全局内存统计功能 2021-02-21 21:28:17 +08:00
xia-chu
14b318525e 添加rtp rtmp个数统计 2021-02-06 20:10:33 +08:00
xiongziliang
bad9553ec4 统计TcpServer个数 2021-01-24 21:59:55 +08:00
xiongziliang
aa45590c13 添加对象统计接口 2021-01-23 09:44:37 +08:00
xiongziliang
af2481c619 ffmpeg拉流支持指定命令模板 2021-01-23 09:42:15 +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
b2fe8c926c 完善代码 2021-01-17 10:29:29 +08:00
monktan
3ddc14d35d 合并pr(#661): 减少unsport code打印，新增git信息获取 
(cherry picked from commit 47f2f5b349)
 2021-01-02 22:02:23 +08:00
xiongziliang
13221ad796 http回复根据状态码自动生成status message: #602 2021-01-02 21:24:06 +08:00
xiongziliang
c69e9b8ec1 主动发送rtp接口(startSendRtp)支持返回本地端口: #538 2021-01-02 20:43:02 +08:00
xiongziliang
bca2b403ae getMediaList接口可以刷选stream:#669 2021-01-02 20:12:33 +08:00
xiongziliang
f9f9cde2b4 整理webapi、webhook框架代码 2020-12-27 22:14:59 +08:00
xiongziliang
781708f0a1 删除兼容代码 2020-12-27 21:48:04 +08:00
xiongziliang
61b29efe94 统一代码风格 2020-12-27 21:21:31 +08:00
夏楚
537ae2f412
Merge pull request #651 from sunhui2013/master 
添加停止、恢复rtp代理rtp超时检查功能,解决播放器暂停后断流问题
 2020-12-27 20:56:33 +08:00
ziyue
fd15fe70b2 合并 https://gitee.com/kingyuanyuan/ZLMediaKit 2020-12-27 18:41:53 +08:00
sunhui
c32c2146b2 添加停止、恢复rtp代理rtp超时检查功能 2020-12-25 16:05:38 +08:00
xiongziliang
bc125e65be addFFmpegSource接口支持enable_hls、enable_mp4参数 2020-12-20 20:25:44 +08:00
wxf
9a05c2be4d 调整 linux 下安装位置 2020-12-17 19:43:17 +08:00
ziyue
8b2fb0bc1f 修复Linux下编译问题 2020-12-06 22:36:44 +08:00
ziyue
c0a4170086 优化http api相关代码,方便自由添加不同类型的api 2020-12-06 21:50:41 +08:00
hewenyuan
50927548e9 增加多路RTP视频流输出 2020-11-27 17:19:55 +08:00
xiongziliang
408a678ade 修复编译问题：#584 2020-11-21 22:32:01 +08:00
xiongziliang
9618748c65 默认hook地址置空，方便关闭hook 
同时整理简化代码
 2020-11-08 09:28:46 +08:00
xiongziliang
38a002646d 修复FFmpeg拉流代理功能缺陷的问题：#533 2020-10-24 23:31:58 +08:00
xiongziliang
67e49cb66e 修复close stream接口返回code不正确的问题 2020-10-24 23:31:40 +08:00
xiongziliang
c5f1b4cd52 程序退出时清空RtpProcess对象 2020-10-24 23:29:44 +08:00
xiongziliang
6a8268f323 添加配置项 mediaServerId 2020-10-01 20:58:19 +08:00
xiongziliang
eee65a51ce 修复FFmpeg截图可能失败的问题 2020-10-01 19:01:48 +08:00
xiongziliang
d047392be0 修复无法关闭FFmpeg子进程的问题 2020-10-01 18:49:36 +08:00
xiongziliang
a1de3bfd30 添加流创建时间、在线时间 2020-10-01 18:57:15 +08:00
xiongziliang
728dd3ec3c 合并pr:#509 2020-10-01 14:53:15 +08:00
xiongziliang
eccb1a664c Merge branch 'dev' of https://github.com/chatop2020/ZLMediaKit 2020-10-01 13:39:19 +08:00
xiongziliang
7f3877e437 添加网速统计功能 2020-10-01 11:02:00 +08:00
qiuzhouwei
4132df89cd 增加了服务器id,修改了record.cpp中mp4录制的自定义录制路径，ffmpegsource中的超时时间，webhook中的唯一id等 2020-09-28 10:45:59 +08:00
xiongziliang
5cd8e8ae1c 添加媒体生成源信息 2020-09-27 11:32:49 +08:00
xiongziliang
2cf66594e8 解决截图失败的问题 2020-09-26 10:07:22 +08:00
xiongziliang
416d21df36 返回值去除std::move 2020-09-21 14:32:56 +08:00
xiongziliang
f84981dc75 合并pr(添加录制ts完成通知): #479 2020-09-20 11:40:42 +08:00
xiongziliang
0fce108de5 Merge branch 'feature/on-record-ts' of https://github.com/wasphin/ZLMediaKit into pr 2020-09-20 11:01:45 +08:00
xiongziliang
9c873e1d19 去除转协议开关参数 2020-09-20 09:26:00 +08:00
wxf
188e087fc2 添加 hls ts 切片录制完成通知 2020-09-14 13:20:45 +08:00
xiongziliang
be1e872f0c 完善按需转协议(包括hls) 2020-09-12 19:20:18 +08:00
xiongziliang
9e26a02fb1 实现rtsp/rtmp按需转协议功能 2020-09-12 19:09:56 +08:00
xiongziliang
040c132fb6 优化stopSendRtp接口返回值 2020-09-06 18:24:48 +08:00
xiongziliang
51ae8d4083 复用忽略协议查找流的相关代码 2020-09-06 18:19:54 +08:00
xiongziliang
09e484794b 实现ps-rtp的发送 #366 2020-09-06 17:56:05 +08:00
xiongziliang
eca9236955 优化与拦截代码 2020-09-06 17:52:07 +08:00
xiongziliang
8961ca1659 修复可能无限递归的bug 2020-08-30 17:03:58 +08:00
xiongziliang
678e011afb FFmpeg拉流添加防呆设计 2020-08-15 09:49:56 +08:00
xiongziliang
461b5da933 修复closeRtpServer接口相关bug:#447 2020-08-08 12:20:44 +08:00
xiongziliang
1638e53b15 未找到流默认等待 2020-08-04 16:47:29 +08:00
xiongziliang
c612f291db 关闭hook时，流不存在就立即返回播放失败:#417 2020-07-16 16:03:22 +08:00
xiongziliang
d6d861c401 openRtpServer接口不允许添加重复的stream_id 2020-07-09 10:57:17 +08:00
xiongziliang
363673dd00 完善getRtpInfo接口 2020-07-09 10:41:17 +08:00
xiongziliang
4b39fd487d 动态创建rtp端口采用stream_id为索引 2020-07-09 10:38:57 +08:00
xiongziliang
b2ff53037b http api新建的rtp服务器可以自动超时移除 2020-07-08 10:25:30 +08:00
xiongziliang
477f99b756 支持动态创建GB28181收流端口并可指定stream_id:#338 2020-07-07 10:01:12 +08:00
xiongziliang
2be19ffb31 添加listRtpServer接口 2020-07-02 22:26:38 +08:00
xiongziliang
b603b8a68d 支持http api动态添加或关闭rtp服务器 2020-07-02 22:23:43 +08:00
xiongziliang
3c858a8351 添加媒体注册回调事件:#373 2020-07-02 18:14:39 +08:00
xiongziliang
e76bc65243 修复开启转协议后，无人观看掐流延时不定期的bug 2020-06-19 10:19:42 +08:00
xiongziliang
6b7e4f5f52 修复子进程日志路径固定的问题 2020-06-11 09:22:28 +08:00
xiongziliang
9c646d1316 完善预设截图相关逻辑 2020-06-10 10:50:37 +08:00
xiongziliang
cecfe7ba54 截图api支持默认图片 2020-06-10 10:33:48 +08:00
xiongziliang
ab847ff575 完善代码 2020-06-08 16:41:49 +08:00
xiongziliang
a3089f9a7e 完善进程管理 2020-06-08 16:26:55 +08:00
xiongziliang
d0fc37db65 修复FFmpeg推流给第三方服务器时不重试的bug 2020-06-08 15:51:12 +08:00
xiongziliang
20e8e1d7ee 完善windows下子进程管理 2020-06-08 15:49:32 +08:00
xiongziliang
b08ea0fcc7 windows下子进程支持日志重定向、等待子进程推出、获取子进程退出码等特性 2020-06-08 14:56:17 +08:00
xiongziliang
fe095a4117 优化日志重定向代码 2020-06-01 11:17:50 +08:00
xiongziliang
ebc1ee2c6e 代码优化 2020-05-28 12:44:25 +08:00
xiongziliang
ff7914e441 修改MediaSource相关接口 2020-05-26 10:11:58 +08:00
xiongziliang
0e9d8df2d0 精简代码 2020-05-14 10:23:12 +08:00
xiongziliang
abe1698601 防止重复创建截图 2020-05-09 09:39:36 +08:00
xiongziliang
5b4d4dab96 优化截图生成逻辑 2020-05-09 09:29:45 +08:00
xiongziliang
76bece0217 实现实时生成和获取截图的http api 2020-05-09 00:06:36 +08:00
xiongziliang
d8e5dbb5b8 崩溃捕获信息打印函数名 2020-05-08 21:59:49 +08:00
xiongziliang
7e85be7654 添加rtmps服务器 2020-04-29 11:25:15 +08:00
xiongziliang
f222af2632 完善代码 2020-04-24 15:28:27 +08:00
xiongziliang
b4228f91c3 适配ZLToolKit 2020-04-24 12:39:22 +08:00
xiongziliang
a9fcd9dbc1 完善接口 2020-04-23 23:57:42 +08:00
xiongziliang
787af5109e api返回音视频相关信息 2020-04-23 23:45:20 +08:00
xiongziliang
eda7a59f3c 统一事件参数类型 2020-04-23 22:04:59 +08:00
xiongziliang
b6946a5968 事件广播触发者改成SockInfo对象 2020-04-23 21:38:44 +08:00
xiongziliang
1d5c6cb141 整理解析器 2020-04-20 18:13:45 +08:00
xiongziliang
1f02144225 完善录制相关api错误提示 2020-04-16 21:31:07 +08:00
xiongziliang
6b621d42db 优化接口 2020-04-15 22:30:24 +08:00
xiongziliang
8a8da61ef5 防止windows下字符编码错误 2020-04-08 13:54:44 +08:00
xiongziliang
e5d5cabf89 部分恢复录制相关接口 2020-04-05 09:26:29 +08:00
xiongziliang
7019e4717c 整理授权协议 2020-04-04 20:30:09 +08:00
xiongziliang
cefb2a7cc4 hls/mp4录制不再能随时开启或关闭 2020-04-04 14:33:12 +08:00
xiongziliang
46be8a38e7 重写MP4点播 2020-04-03 20:45:58 +08:00
xiongziliang
ace200716a 修复无人播放事件触发延时不准确的bug 2020-03-23 10:21:17 +08:00
xiongziliang
1168174c2b tab统一替换为4个空格键：#242 2020-03-20 11:51:24 +08:00
xiongziliang
a7a376b3f2 流量汇报事件添加id参数 2020-02-13 12:10:08 +08:00
xiongziliang
7e25537957 流量汇报事件添加客户端ip和端口参数 2020-02-13 11:33:59 +08:00
xiongziliang
89e191f7fd 添加接口：getMp4RecordFile 2020-02-01 23:26:33 +08:00
xiongziliang
e8ba94ba09 还原代码 2020-02-01 22:58:21 +08:00
liuziloong
2384aa5bbd MP4录像增加一级目录，按照：年月/年月日/*.mp4存储； 
增加按月，按天查询mp4录像；
消除一处编译器警告；
 2020-01-20 15:02:45 +08:00
liuziloong
ee2ca4bda5 Merge branch 'master' into research 2020-01-19 15:09:34 +08:00
liuziloong
d2d84680c0 temp 2020-01-19 14:54:31 +08:00
xiongziliang
cbd6cd4e60 替换不可调试的宏代码 2020-01-17 11:44:20 +08:00
Luke
81d3e54d45 mark 2020-01-16 11:08:15 +08:00
Luke
dad0175094 Merge branch 'master' into research 2020-01-14 11:39:43 +08:00
Luke
2d9537ec84 snap 2020-01-14 10:36:38 +08:00
xiongziliang
835d6bd9b5 允许本机和超级用户任意访问http目录 2020-01-09 17:03:29 +08:00
xiongziliang
9cdbe4c4ef 修复协议转换配置开关不生效的bug 2020-01-07 15:38:35 +08:00
xiongziliang
5258169a07 修复协议转换配置开关不生效的bug 2020-01-07 15:37:48 +08:00
xiongziliang
16751ddf04 windows支持FFmpeg拉流代理 2020-01-07 15:10:59 +08:00
xiongziliang
77bbc7ae4d Merge remote-tracking branch 'FreeNVR/freenvr' 
# Conflicts:
#	server/FFmpegSource.cpp
#	server/Process.cpp
#	server/Process.h
#	server/System.cpp
 2020-01-07 15:08:15 +08:00