648540858
|
415c13cf72
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-06-10 00:33:00 +08:00 |
|
648540858
|
4ed7cb49be
|
优化sdp解析，兼容带有f=的设备
|
2023-06-10 00:32:42 +08:00 |
|
648540858
|
0a538ca23d
|
Merge pull request #887 from bigbeef/wvp-28181-2.0
fix:修复拉流代理配置展示问题:音频、录制、无人观看
|
2023-06-09 23:18:15 +08:00 |
|
winfed
|
45ad19b712
|
feat:删除拉流代理时，提示是否确认删除，防止误删
|
2023-06-09 15:50:33 +08:00 |
|
winfed
|
9f50dd8fcb
|
fix:修复拉流代理配置展示问题:音频、录制、无人观看
|
2023-06-09 15:19:18 +08:00 |
|
648540858
|
4815af8ca0
|
修复stream-on-demand配置失效的BUG
|
2023-06-08 22:46:07 +08:00 |
|
648540858
|
4d8cf32fbc
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
|
2023-06-08 10:41:36 +08:00 |
|
648540858
|
508b3aa44f
|
优化ffmpeg拉流代理
|
2023-06-08 10:40:16 +08:00 |
|
648540858
|
0b8584243f
|
优化via的branch生成规则
|
2023-06-07 21:45:15 +08:00 |
|
648540858
|
3d2f34e736
|
增加收到notify增加或移除通道时发送redis消息
|
2023-06-07 21:11:39 +08:00 |
|
648540858
|
3a2468eef5
|
支持redis消息强制关闭流
|
2023-06-07 20:58:35 +08:00 |
|
648540858
|
e196e012de
|
合并分支
|
2023-06-07 20:27:57 +08:00 |
|
648540858
|
96f8bded6e
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
|
2023-06-07 20:21:10 +08:00 |
|
648540858
|
e7402c9488
|
修复录像下载，优化拉流代理接口
|
2023-06-07 20:15:08 +08:00 |
|
648540858
|
730779ba86
|
优化截图获取接口
|
2023-06-05 11:10:15 +08:00 |
|
648540858
|
8e014cce07
|
修复拉流代理的ffmpeg代理方式
|
2023-06-05 10:28:11 +08:00 |
|
648540858
|
3c1528b168
|
修复添加目录SQL错误 #881
|
2023-06-05 09:39:59 +08:00 |
|
648540858
|
6a24603fd3
|
优化日志
|
2023-06-02 16:40:19 +08:00 |
|
648540858
|
75bb0ec40a
|
优化点播流程中ssrc的释放
|
2023-06-02 15:46:07 +08:00 |
|
648540858
|
b840b94bd2
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-06-01 15:58:33 +08:00 |
|
648540858
|
8903f64532
|
Merge pull request #872 from xu-bin-bin/wvp-28181-2.0
删除2.6.8升级2.6.9.sql文件中给表gb_stream添加主键sql，保证升级脚本能正常执行。
|
2023-06-01 15:58:19 +08:00 |
|
648540858
|
0ddaa93bbf
|
Merge pull request #878 from callinglove/wvp-28181-2.0
修复 启用代理失败： ->缺少必要参数:"src_url","dst_url","timeout_ms"
|
2023-06-01 14:55:14 +08:00 |
|
yanggs
|
5acd9af03d
|
修复 启用代理失败： ->缺少必要参数:"src_url","dst_url","timeout_ms"
|
2023-06-01 13:30:48 +08:00 |
|
xubinbin
|
7a9ce766a7
|
删除2.6.8升级2.6.9.sql文件中给表gb_stream添加主键sql，保证升级脚本能正常执行。
|
2023-05-30 13:24:46 +08:00 |
|
648540858
|
0333d83b6c
|
去除多余配置
|
2023-05-30 11:20:22 +08:00 |
|
648540858
|
406d9a6227
|
修复级联点播的空指针异常 #864
|
2023-05-30 11:00:11 +08:00 |
|
648540858
|
7d1cf85fb9
|
修复web端管理节点负载不显示国标收流 #871
|
2023-05-30 10:54:09 +08:00 |
|
648540858
|
7e818d0c07
|
移除手动配置mybatis下划线转驼峰
|
2023-05-30 10:32:08 +08:00 |
|
648540858
|
db51c6ae88
|
添加获取截图接口
|
2023-05-29 23:28:06 +08:00 |
|
648540858
|
3649f1d89a
|
修复引入的错误Order
|
2023-05-29 20:18:42 +08:00 |
|
648540858
|
c2f40e6adc
|
修复设备列表状态显示
|
2023-05-29 15:24:18 +08:00 |
|
648540858
|
f500c17eeb
|
修复地图页面云台状态显示以及状态显示
|
2023-05-29 15:16:44 +08:00 |
|
648540858
|
0400f66e85
|
添加文档
|
2023-05-29 09:40:36 +08:00 |
|
648540858
|
47a87cf98e
|
Merge branch 'postgresql' into wvp-28181-2.0
|
2023-05-29 09:25:45 +08:00 |
|
648540858
|
8c411a7d93
|
修复升级sql
|
2023-05-29 09:23:21 +08:00 |
|
648540858
|
f0ac6fb35e
|
Merge pull request #869 from shanyuanzz/wvp-28181-2.0
优化低倍速下云台控制的zoom缩放速率变化问题。
|
2023-05-29 09:14:56 +08:00 |
|
shanyuanzz
|
0e0c50ac44
|
优化低倍速下zoom变倍速率
1.优化zoom缩放在1-FH低倍速下的变倍速率。
避免变倍速率过大或者某些相机无法变倍的问题。
|
2023-05-28 14:01:51 +08:00 |
|
shanyuanzz
|
e09bcc0d66
|
优化zoom低倍速下的变倍速率
优化zoom低倍速下的变倍速率
|
2023-05-28 13:48:55 +08:00 |
|
shanyuanzz
|
27bc043028
|
Update SIPCommander.java
Add by 白米粥
1.修正云台控制的zoom的speedbug。
解决当zoom时speed为1-FH时速度变化为1-FH，而10H~FFH以上时是以首位速度进行变化，变化速率过于不一致。
修改后1-FH的速度均以1的速率进行缩放变倍。
|
2023-05-28 13:39:16 +08:00 |
|
648540858
|
ac2af3d3a0
|
去除多余注释
|
2023-05-23 14:35:40 +08:00 |
|
648540858
|
4c1b5dd464
|
修复推流鉴权
|
2023-05-23 10:34:00 +08:00 |
|
648540858
|
c9d69f0ac0
|
修复字段名错误
|
2023-05-22 11:23:48 +08:00 |
|
648540858
|
e52e2b634f
|
本地集成人大金仓连接jar
|
2023-05-17 10:29:45 +08:00 |
|
648540858
|
5d4e49e1eb
|
本地集成人大金仓连接jar
|
2023-05-16 17:17:24 +08:00 |
|
648540858
|
d4e08632cd
|
兼容人大金仓对online作为保留字段的要求
|
2023-05-16 15:13:38 +08:00 |
|
648540858
|
9744e86ad0
|
Merge pull request #852 from kairlec/wvp-28181-2.0
fix response `content-type` is not set if access without access token
|
2023-05-15 16:30:21 +08:00 |
|
Kairlec
|
d7bbc6203c
|
fix response content-type is not set if access without access token
|
2023-05-15 16:26:37 +08:00 |
|
648540858
|
2bf76b55b8
|
优化部分sql实现
|
2023-05-15 16:08:31 +08:00 |
|
648540858
|
19e11268db
|
优化部分sql实现
|
2023-05-15 15:29:39 +08:00 |
|
648540858
|
a24a7a84c0
|
Merge pull request #847 from xu-bin-bin/wvp-28181-2.0
"@schedule"是Spring框架提供的一种定时任务执行机制，默认情况下它是单线程执行，将其修改为支持多线程。
|
2023-05-12 14:03:41 +08:00 |
|