Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
725 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

476 Commits (52656bb89314142c5c96d7bbfcdf452235603a28)

Author SHA1 Message Date
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
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 0cad0920c6 录像回放时不进行录像下载 2021-11-26 23:13:59 +08:00
648540858 54568adfdd 优化录像下载逻辑以及录像查询逻辑 2021-11-26 23:05:36 +08:00
648540858 398e5c2a93 优化录像代理更新 2021-11-25 16:40:51 +08:00
648540858 be7082f5e2 优化多线程参数 2021-11-25 15:33:25 +08:00
648540858 59e369e37d 优化兼容接口 2021-11-25 11:04:03 +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 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 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
648540858 3e76214d07 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2021-11-22 14:36:14 +08:00
648540858 28abaa7450 添加docker打包专用配置文件 2021-11-22 14:35:36 +08:00
648540858 297f896552 兼容缺少y=的sdp 2021-11-20 21:03:42 +08:00
648540858 96d9a77dbe 修复REDIS_PWD导致的docker镜像无法启动 2021-11-19 17:21:53 +08:00
648540858 e2ce28347a 优化注释 2021-11-18 11:50:56 +08:00
648540858 52ef9a84dd 修复设备控制 处理 2021-11-18 11:50:31 +08:00
648540858 aebd70cc25 #227 2021-11-18 10:40:24 +08:00
648540858 c23932eb00 #221 2021-11-17 22:58:41 +08:00
648540858 cb213f4417 修复 #223与去除警告 2021-11-17 18:13:05 +08:00
648540858 90c29240e0 去除调试日志 2021-11-17 17:55:32 +08:00
648540858 c62c66edef 去除调试日志 2021-11-17 17:53:25 +08:00