Commit Graph

826 Commits

Author SHA1 Message Date
648540858
5b0b17d741 添加第三方服务参与的推流直接转发到国标功能 2021-12-04 17:27:23 +08:00
648540858
52656bb893 修复mediaserverId未存入导致的问题 2021-12-03 17:03:35 +08:00
648540858
241804f5f8 优化redis存储,alarm默认关闭处理 2021-12-03 16:13:46 +08:00
648540858
42d8fff574 兼容流注销时流产生类型错误的问题 2021-12-03 10:18:50 +08:00
648540858
963a74d280 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2021-12-03 09:16:40 +08:00
648540858
2bac0b3c22 存储所有流信息到redis 2021-12-02 23:01:06 +08:00
648540858
a797cd1c4b 优化zlm接入 2021-12-02 18:09:38 +08:00
648540858
2a1f979651 简化zlm节点接入逻辑 2021-12-02 17:37:29 +08:00
648540858
a1398a56cc Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2021-12-02 09:33:20 +08:00
648540858
ffb0fcb907
Merge pull request #259 from hotcoffie/wvp-28181-2.0
1.适配新的gitee地址
2021-12-02 09:30:57 +08:00
xiaoxie
a0c7b35e1d 修复一处错误,恢复application.yml media.stream-ip原来的值 2021-12-01 22:58:00 +08:00
xiaoxie
7371db4674 修复一处错误,application.yml media.stream-ip的值应该等于media.ip而不是之前的sip.ip 2021-12-01 22:49:45 +08:00
xiaoxie
6ac131bcf6 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2021-12-01 22:45:51 +08:00
xiaoxie
0984290ca2 继续优化docker配置:
1.启动命令增加ASSIST_JVM_CONFIG和WVP_JVM_CONFIG两个字段,方便配置JVM参数
2.修复一处错误,application.yml media.stream-ip的值应该等于media.ip而不是之前的sip.ip
2021-12-01 22:45:38 +08:00
hotcoffie
a16b4f71ec
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2021-12-01 20:35:16 +08:00
xiaoxie
f89672757a 1.适配新的gitee地址
2.增加docker-compose相关配置
2021-12-01 20:28:13 +08:00
648540858
fb9678e9d3 修复兼容接口云台控制 2021-11-30 10:40:22 +08:00
648540858
b4e7ed0bf7 修复兼容接口云台控制 2021-11-30 10:16:09 +08:00
648540858
019827fd35 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2021-11-29 18:09:49 +08:00
648540858
3c0dde2f3c 修复兼容接口 2021-11-29 18:09:19 +08:00
648540858
83bdb9117f 修复流变化通知的json格式 2021-11-29 18:08:02 +08:00
648540858
b325eb0da4 Update issue templates 2021-11-29 17:36:17 +08:00
648540858
71ca5d8049 Update issue templates 2021-11-29 17:34:41 +08:00
648540858
8716ffd2f1 Update issue templates 2021-11-29 17:33:45 +08:00
648540858
0cad0920c6 录像回放时不进行录像下载 2021-11-26 23:13:59 +08:00
648540858
54568adfdd 优化录像下载逻辑以及录像查询逻辑 2021-11-26 23:05:36 +08:00
648540858
3bf2e6eee5 优化录像推送开关 2021-11-26 15:15:55 +08:00
648540858
6d7591625d Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2021-11-25 16:41:14 +08:00
648540858
398e5c2a93 优化录像代理更新 2021-11-25 16:40:51 +08:00
648540858
33a5911f94 优化回放控制界面 2021-11-25 16:28:52 +08:00
648540858
be7082f5e2 优化多线程参数 2021-11-25 15:33:25 +08:00
648540858
59e369e37d 优化兼容接口 2021-11-25 11:04:03 +08:00
648540858
077702b8b2
Update README.md 2021-11-25 10:45:20 +08:00
648540858
e192009325 优化录像查询接口 2021-11-24 18:48:02 +08:00
648540858
d87ff7bf4d 添加回放控制界面,优化录像查询接口 2021-11-24 18:48:02 +08:00
648540858
88d5b106cf 优化拉流代理参数默认值 2021-11-24 15:46:20 +08:00
648540858
08c45876df 优化倍速播放参数 2021-11-24 15:10:10 +08:00
648540858
20082441ef 拉流代理接口添加无人观看则自动移除参数,拉流代理返回值增加流地址信息 2021-11-24 15:09:43 +08:00
648540858
dbcd050c66 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2021-11-24 15:04:27 +08:00
648540858
6ed563e4b4
Merge pull request #243 from chenparty/wvp-28181-2.0
增加回放控制功能(回放暂停、回放恢复、回放拖动播放、回放倍速播放)
2021-11-24 15:04:03 +08:00
648540858
f61051c463 优化streamchannge hook以及对推流的识别 2021-11-24 11:19:52 +08:00
648540858
0eee65bc42 保存拉流代理返回结果添加streamInfo 2021-11-24 10:02:47 +08:00
chenparty
4142601a4b 增加回放控制功能(回放暂停、回放恢复、回放拖动播放、回放倍速播放) 2021-11-23 17:09:15 +08:00
648540858
3f5eba1a60 修改消息通道为大写 2021-11-23 16:43:09 +08:00
648540858
b1c92cf4e8 在redis中添加wvp存活依据,添加推流变化消息 2021-11-23 14:51:37 +08:00
648540858
6282c81bc5 移除onvif实现 2021-11-23 11:35:23 +08:00
648540858
dda68ac044 优化录像下载,避免wvp代理使用双份流量 2021-11-22 17:30:15 +08:00
648540858
0199676a6d 查询流地址时mediaServerId改为可选 2021-11-22 17:29:16 +08:00
648540858
692348c395 sip错误时移除会话 2021-11-22 17:28:18 +08:00
648540858
4cd5efbba5 修改错别字 2021-11-22 17:27:48 +08:00