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 |
|
xiongziliang
|
9c42c5ed8c
|
windows视频FFmpeg拉流代理
|
2020-01-07 14:37:18 +08:00 |
|