648540858
|
b4048fbe80
|
合并开源主线
|
2023-04-04 09:09:07 +08:00 |
|
648540858
|
91bfbc36f1
|
优化设备注册，支持到期续订，优化国标级联到期续订。
|
2023-03-28 14:09:41 +08:00 |
|
648540858
|
3b1516afe5
|
优化录像配置。不再使用zlm默认的http服务器
|
2023-03-25 18:40:29 +08:00 |
|
xiaoQQya
|
713aa00acc
|
perf(snap): 优化点播成功后截图使用 rtsp 流, 新增对 H265 编码视频截图的支持
|
2023-03-22 15:21:22 +08:00 |
|
648540858
|
6b1d966255
|
优化合并对讲broadcast级联模式
|
2023-03-21 10:27:07 +08:00 |
|
648540858
|
4362a5b499
|
主线合并对讲broadcast级联模式
|
2023-03-20 15:42:59 +08:00 |
|
648540858
|
26bdf2e776
|
Merge branch '级联' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
# web_src/src/components/dialog/devicePlayer.vue
|
2023-03-20 15:31:43 +08:00 |
|
648540858
|
039fbf7e24
|
Merge branch 'talk' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2023-03-20 14:32:53 +08:00 |
|
648540858
|
a000ed6062
|
完善talk模式
|
2023-03-20 14:20:28 +08:00 |
|
648540858
|
c3ce2bc5d0
|
优化异常处理以及级联设备状态查询
|
2023-03-17 13:22:05 +08:00 |
|
648540858
|
72b9239c5a
|
优化消息通道
|
2023-03-16 20:32:22 +08:00 |
|
648540858
|
eec4e347d7
|
优化端口保持
|
2023-03-16 20:19:00 +08:00 |
|
648540858
|
8c2b1ef4fe
|
修复拉流代理 下线时状态未更改为下线 #770
|
2023-03-14 18:46:01 +08:00 |
|
648540858
|
a7c3cf5316
|
优化跨域配置，支持同域的前后端分离部署
|
2023-03-05 09:53:26 +08:00 |
|
648540858
|
420dbce900
|
Merge branch 'main' into 级联
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2023-02-22 18:14:53 +08:00 |
|
648540858
|
019d95cfba
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2023-02-22 18:08:25 +08:00 |
|
648540858
|
100252a253
|
完善语音对讲
|
2023-02-22 18:06:52 +08:00 |
|
648540858
|
2d2832dbe9
|
优化各个配置启动顺序
|
2023-02-22 18:01:30 +08:00 |
|
648540858
|
db8971302a
|
完善支持语音级联
|
2023-02-22 15:53:33 +08:00 |
|
648540858
|
663130df45
|
完善支持语音对讲talk
|
2023-02-19 12:46:53 +08:00 |
|
648540858
|
d5f26faf15
|
优化语音对讲级联，目前等待zlm支持openRTPServer仅收音频
|
2023-02-14 11:29:22 +08:00 |
|
648540858
|
3380ce30a2
|
合并主线
|
2023-02-13 20:52:36 +08:00 |
|
648540858
|
197f80581b
|
Merge branch 'main' into main2
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2023-02-10 16:25:33 +08:00 |
|
648540858
|
f2c6210539
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# doc/_content/introduction/deployment.md
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
# src/main/resources/all-application.yml
# web_src/src/components/dialog/devicePlayer.vue
|
2023-02-10 16:24:27 +08:00 |
|
648540858
|
ec95a42985
|
Merge branch 'main' into main2
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/resources/all-application.yml
# web_src/src/components/dialog/devicePlayer.vue
|
2023-02-10 15:54:42 +08:00 |
|
xiaoQQya
|
d50dd3fe84
|
perf(ZLMRESTfulUtils): 修改OkHttpClient 读取超时时间，解决点播时截图快照获取超时的问题
|
2023-02-04 18:12:25 +08:00 |
|
gaoxun250@sina.com
|
0a380c6ff9
|
解决截图被占用无法打开问题
|
2023-02-03 14:19:10 +08:00 |
|
648540858
|
c19ad94c3e
|
优化目录更新，更新失败时只更新收到的内容不重置所有通道和自动拉流
|
2023-01-15 15:27:47 +08:00 |
|
648540858
|
dea44dcd78
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/resources/all-application.yml
# web_src/src/components/dialog/devicePlayer.vue
|
2023-01-13 16:21:17 +08:00 |
|
648540858
|
e14cef8062
|
优化语音对讲
|
2023-01-05 16:38:33 +08:00 |
|
648540858
|
6fa5b37b96
|
Merge branch 'main' into main2
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/resources/all-application.yml
|
2023-01-05 11:07:06 +08:00 |
|
648540858
|
fc90cd7951
|
优化tcp主动方式的语音对讲
|
2022-12-19 14:20:22 +08:00 |
|
648540858
|
4b827f3897
|
级联语音对讲部分
|
2022-12-13 11:57:07 +08:00 |
|
648540858
|
c1145a8163
|
优化级联注册，以及sip日志
|
2022-12-12 10:28:36 +08:00 |
|
648540858
|
131ea77669
|
接口使用旧的stream信息，支持使用远程ip端口做为回复的地址而不是使用sip中的地址
|
2022-12-06 10:33:43 +08:00 |
|
648540858
|
6c9d6f0054
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
|
2022-11-29 13:16:20 +08:00 |
|
648540858
|
f89491ada3
|
修复单端口模式下ssrc的释放 #667
|
2022-11-25 14:38:46 +08:00 |
|
648540858
|
bdd9ff1fd7
|
优化okhttp并发参数
|
2022-11-25 11:57:46 +08:00 |
|
648540858
|
fa2ccb4ec8
|
修复协议端口配置不全导致前端播放页面无法弹出的问题
|
2022-11-25 10:50:16 +08:00 |
|
648540858
|
80d96042e7
|
优化语音对讲
|
2022-11-24 20:01:03 +08:00 |
|
648540858
|
12fa3b4c8d
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
|
2022-11-23 09:57:17 +08:00 |
|
648540858
|
8ea6e192d9
|
优化拉流代理表单以及逻辑
|
2022-11-22 17:17:35 +08:00 |
|
648540858
|
6b03568c5d
|
优化rtcp判断
|
2022-11-21 17:07:54 +08:00 |
|
648540858
|
ecf84bb0f1
|
合并主线
|
2022-11-18 21:52:02 +08:00 |
|
648540858
|
f223aad705
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
# src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
# web_src/src/components/dialog/devicePlayer.vue
|
2022-11-18 18:39:44 +08:00 |
|
648540858
|
6b8ecd1f9d
|
优化级联注册稳定性
|
2022-11-17 18:09:28 +08:00 |
|
648540858
|
23710f1c64
|
优化多网卡下的localIp获取
|
2022-11-17 17:01:54 +08:00 |
|
648540858
|
d340a37a00
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-11-17 11:31:30 +08:00 |
|
648540858
|
c04de4cd70
|
注释与日志优化
|
2022-11-17 10:04:05 +08:00 |
|
648540858
|
694076dc8c
|
优化国标级联发流并发能力
|
2022-11-16 09:39:27 +08:00 |
|