648540858
|
c4c598f65b
|
修复rtsp端口配置未从zlm获取的问题
|
2021-12-06 10:47:24 +08:00 |
|
648540858
|
07da765c5b
|
修复选择直播通道缺失了通道类型的问题
|
2021-12-06 10:44:33 +08:00 |
|
648540858
|
8489f48f92
|
添加第三方服务参与的推流直接转发到国标功能
|
2021-12-04 17:27:23 +08:00 |
|
648540858
|
7d9245b756
|
修复mediaserverId未存入导致的问题
|
2021-12-03 17:03:35 +08:00 |
|
648540858
|
1af90cbb4d
|
优化redis存储，alarm默认关闭处理
|
2021-12-03 16:13:46 +08:00 |
|
648540858
|
4fdc88cc8f
|
兼容流注销时流产生类型错误的问题
|
2021-12-03 10:18:50 +08:00 |
|
648540858
|
657a659d5c
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2021-12-03 09:16:40 +08:00 |
|
648540858
|
dc0b8d9e78
|
存储所有流信息到redis
|
2021-12-02 23:01:06 +08:00 |
|
648540858
|
8265889db1
|
优化zlm接入
|
2021-12-02 18:09:38 +08:00 |
|
648540858
|
6c8b96e1b1
|
简化zlm节点接入逻辑
|
2021-12-02 17:37:29 +08:00 |
|
648540858
|
2910764047
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2021-12-02 09:33:20 +08:00 |
|
648540858
|
2e90e1166a
|
Merge pull request #259 from hotcoffie/wvp-28181-2.0
1.适配新的gitee地址
|
2021-12-02 09:30:57 +08:00 |
|
xiaoxie
|
73ec3234d4
|
修复一处错误，恢复application.yml media.stream-ip原来的值
|
2021-12-01 22:58:00 +08:00 |
|
xiaoxie
|
53ebc60590
|
修复一处错误，application.yml media.stream-ip的值应该等于media.ip而不是之前的sip.ip
|
2021-12-01 22:49:45 +08:00 |
|
xiaoxie
|
0765874086
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2021-12-01 22:45:51 +08:00 |
|
xiaoxie
|
b78d665d72
|
继续优化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
|
3a20750c2f
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2021-12-01 20:35:16 +08:00 |
|
xiaoxie
|
8ec9d8a4f5
|
1.适配新的gitee地址
2.增加docker-compose相关配置
|
2021-12-01 20:28:13 +08:00 |
|
648540858
|
8525cd839a
|
修复兼容接口云台控制
|
2021-11-30 10:40:22 +08:00 |
|
648540858
|
d77382348d
|
修复兼容接口云台控制
|
2021-11-30 10:16:09 +08:00 |
|
648540858
|
9d189c97cd
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2021-11-29 18:09:49 +08:00 |
|
648540858
|
158214dd7e
|
修复兼容接口
|
2021-11-29 18:09:19 +08:00 |
|
648540858
|
6517c9534b
|
修复流变化通知的json格式
|
2021-11-29 18:08:02 +08:00 |
|
648540858
|
2adef25454
|
Update issue templates
|
2021-11-29 17:36:17 +08:00 |
|
648540858
|
ee4b659d31
|
Update issue templates
|
2021-11-29 17:34:41 +08:00 |
|
648540858
|
7b07753340
|
Update issue templates
|
2021-11-29 17:33:45 +08:00 |
|
648540858
|
e3647b8142
|
录像回放时不进行录像下载
|
2021-11-26 23:13:59 +08:00 |
|
648540858
|
94034c3c09
|
优化录像下载逻辑以及录像查询逻辑
|
2021-11-26 23:05:36 +08:00 |
|
648540858
|
70fc8f4e3e
|
优化录像推送开关
|
2021-11-26 15:15:55 +08:00 |
|
648540858
|
4685943f6b
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2021-11-25 16:41:14 +08:00 |
|
648540858
|
2b6aea9360
|
优化录像代理更新
|
2021-11-25 16:40:51 +08:00 |
|
648540858
|
b5594c6689
|
优化回放控制界面
|
2021-11-25 16:28:52 +08:00 |
|
648540858
|
a457c94838
|
优化多线程参数
|
2021-11-25 15:33:25 +08:00 |
|
648540858
|
504a886f0c
|
优化兼容接口
|
2021-11-25 11:04:03 +08:00 |
|
648540858
|
ba81fec703
|
Update README.md
|
2021-11-25 10:45:20 +08:00 |
|
648540858
|
428adc039d
|
优化录像查询接口
|
2021-11-24 18:48:02 +08:00 |
|
648540858
|
d42bbfb421
|
添加回放控制界面，优化录像查询接口
|
2021-11-24 18:48:02 +08:00 |
|
648540858
|
9edbf220e3
|
优化拉流代理参数默认值
|
2021-11-24 15:46:20 +08:00 |
|
648540858
|
c667d8f99b
|
优化倍速播放参数
|
2021-11-24 15:10:10 +08:00 |
|
648540858
|
79d938cdd3
|
拉流代理接口添加无人观看则自动移除参数，拉流代理返回值增加流地址信息
|
2021-11-24 15:09:43 +08:00 |
|
648540858
|
fb14cd3d68
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2021-11-24 15:04:27 +08:00 |
|
648540858
|
95d847c24d
|
Merge pull request #243 from chenparty/wvp-28181-2.0
增加回放控制功能（回放暂停、回放恢复、回放拖动播放、回放倍速播放）
|
2021-11-24 15:04:03 +08:00 |
|
648540858
|
c1f5108ec2
|
优化streamchannge hook以及对推流的识别
|
2021-11-24 11:19:52 +08:00 |
|
648540858
|
22e411c17d
|
保存拉流代理返回结果添加streamInfo
|
2021-11-24 10:02:47 +08:00 |
|
chenparty
|
65445b06c2
|
增加回放控制功能（回放暂停、回放恢复、回放拖动播放、回放倍速播放）
|
2021-11-23 17:09:15 +08:00 |
|
648540858
|
592149d2d5
|
修改消息通道为大写
|
2021-11-23 16:43:09 +08:00 |
|
648540858
|
246a197b6e
|
在redis中添加wvp存活依据，添加推流变化消息
|
2021-11-23 14:51:37 +08:00 |
|
648540858
|
65dff203ee
|
移除onvif实现
|
2021-11-23 11:35:23 +08:00 |
|
648540858
|
64f4da3ca1
|
优化录像下载，避免wvp代理使用双份流量
|
2021-11-22 17:30:15 +08:00 |
|
648540858
|
3d8c01ca99
|
查询流地址时mediaServerId改为可选
|
2021-11-22 17:29:16 +08:00 |
|