648540858
|
7d3cbb8253
|
Merge branch 'wvp-28181-2.0' into main-dev
|
2023-07-24 09:42:32 +08:00 |
|
648540858
|
d48f89eee4
|
修复端口分配的并发问题
|
2023-07-24 09:04:47 +08:00 |
|
648540858
|
db6dd3f755
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# 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/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
|
2023-07-19 11:33:58 +08:00 |
|
648540858
|
19533c8f4d
|
合并分支功能
|
2023-07-17 17:28:49 +08:00 |
|
648540858
|
32c73ff595
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2023-07-17 16:56:58 +08:00 |
|
648540858
|
5c49627012
|
优化发流端口分配
|
2023-07-17 16:55:41 +08:00 |
|
648540858
|
7a120c6da4
|
优化日志
|
2023-07-17 16:54:00 +08:00 |
|
朱俊杰
|
4f2cd41134
|
修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突
|
2023-07-17 10:54:34 +08:00 |
|
648540858
|
287d42c196
|
推流默认开启音频
|
2023-07-14 11:27:58 +08:00 |
|
648540858
|
c42d391290
|
修复数据存储
|
2023-07-14 08:34:15 +08:00 |
|
648540858
|
668dc8f0dd
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# 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/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookResultForOnPublish.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
|
2023-07-13 14:47:24 +08:00 |
|
648540858
|
9fc3db1f5e
|
增加发流音视频分开发送
|
2023-07-13 14:30:41 +08:00 |
|
648540858
|
f525b55729
|
修复发流复盖的为问题
|
2023-07-12 15:13:53 +08:00 |
|
648540858
|
04e7f48fde
|
合并主线的发流端口管理逻辑
|
2023-07-10 14:30:59 +08:00 |
|
648540858
|
885842249f
|
优化第三方对接接口
|
2023-07-07 18:17:24 +08:00 |
|
648540858
|
deeff5533b
|
添加兼容目录同步兼容性
|
2023-07-05 17:20:20 +08:00 |
|
648540858
|
457c5e3821
|
修复拉流代理无人观看自动停用失败
|
2023-07-04 11:10:17 +08:00 |
|
648540858
|
9889f908c8
|
合并主线
|
2023-07-04 11:08:14 +08:00 |
|
648540858
|
becea82736
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# 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/AckRequestProcessor.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/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
|
2023-07-04 10:10:48 +08:00 |
|
648540858
|
43ef195543
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
|
2023-07-03 16:54:09 +08:00 |
|
648540858
|
e4622d17a6
|
优化字段名称
|
2023-07-03 10:36:02 +08:00 |
|
648540858
|
3571ca272b
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# web_src/config/index.js
|
2023-07-02 12:42:05 +08:00 |
|
648540858
|
01bc6c857e
|
Merge pull request #908 from cnless/wvp-28181-2.0
fix:修复ResponseBody未关闭以及点播超时报错AsyncRequestTimeoutException
|
2023-07-01 23:04:39 +08:00 |
|
648540858
|
c551164c89
|
合并主线
|
2023-07-01 18:33:42 +08:00 |
|
648540858
|
975ace051b
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# 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/media/zlm/ZLMRTPServerFactory.java
|
2023-07-01 18:28:28 +08:00 |
|
648540858
|
b64f320805
|
优化发流逻辑
|
2023-07-01 18:10:33 +08:00 |
|
648540858
|
74ad4235f1
|
修复tcp主动的推流
|
2023-07-01 13:01:56 +08:00 |
|
648540858
|
fb90dfdac5
|
临时提交
|
2023-07-01 10:14:19 +08:00 |
|
648540858
|
1458014fe3
|
修复合并主线后语音对讲失败的问题
|
2023-06-30 15:24:07 +08:00 |
|
648540858
|
c014a90cc6
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# 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/media/zlm/ZLMHttpHookListener.java
|
2023-06-29 16:08:05 +08:00 |
|
648540858
|
0592fd676f
|
修复使用推流状态作为推流通道状态为false仍然发送通知
|
2023-06-29 11:22:32 +08:00 |
|
648540858
|
f62bf7b2c6
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Gb28181Sdp.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/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/utils/SipUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
|
2023-06-29 09:52:05 +08:00 |
|
648540858
|
def56793ba
|
增加上级推流和停止推流的通知
|
2023-06-28 16:52:27 +08:00 |
|
648540858
|
a77628e875
|
优化端口预占用，防止占用无法释放
|
2023-06-28 14:50:46 +08:00 |
|
648540858
|
5a7a7a12bd
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.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/response/impl/InviteResponseProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.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
# src/main/resources/all-application.yml
# web_src/config/index.js
# web_src/src/components/dialog/devicePlayer.vue
|
2023-06-27 16:46:26 +08:00 |
|
648540858
|
724963324a
|
修复上级点播时如果推流信息中mediaServerID错误的情况
|
2023-06-26 19:06:14 +08:00 |
|
dsk
|
cec266d3cd
|
修复请求报错404等情况下导致ResponseBody未关闭的问题
|
2023-06-25 16:00:37 +08:00 |
|
648540858
|
66eda32ab9
|
优化端口预占用
|
2023-06-25 10:18:29 +08:00 |
|
648540858
|
155838ce2e
|
优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895
|
2023-06-22 22:35:35 +08:00 |
|
648540858
|
7b24d51db9
|
优化国标级联的端口保持
|
2023-06-21 14:03:31 +08:00 |
|
‘sxh’
|
ccc0a99d68
|
同步主线的代码，保持一致性
|
2023-06-15 11:20:43 +08:00 |
|
‘sxh’
|
652489b47e
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
|
2023-06-15 11:10:20 +08:00 |
|
‘sxh’
|
15df08964b
|
新增设备主子码流选择，默认为不开启
|
2023-06-15 11:00:29 +08:00 |
|
648540858
|
e68eb850a9
|
去除多余日志
|
2023-06-13 23:11:56 +08:00 |
|
648540858
|
c4d7dd9651
|
Merge branch '2.6.8' into wvp-28181-2.0
|
2023-06-13 23:11:00 +08:00 |
|
648540858
|
8f5bbfa5c2
|
修复zlm上线时过期任务设置错误
|
2023-06-13 23:06:35 +08:00 |
|
648540858
|
03f3598681
|
修复stream-on-demand配置失效的BUG
|
2023-06-08 22:46:07 +08:00 |
|
648540858
|
b7f2a6b25b
|
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
|
97b04c4dba
|
修复录像下载，优化拉流代理接口
|
2023-06-07 20:15:08 +08:00 |
|
648540858
|
2ef4111297
|
修复拉流代理的ffmpeg代理方式
|
2023-06-05 10:28:11 +08:00 |
|