From 516c3afd526c8e02db75e9115f4412b57296cc8a Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 26 九月 2023 17:12:55 +0800
Subject: [PATCH] 流媒体增加音频转码 流媒体适配mediaMTX新版本1.1.1
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/sdk/LoginResultCallBack.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/sdk/LoginResultCallBack.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/sdk/LoginResultCallBack.java
index 66fb37b..8f369f6 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/sdk/LoginResultCallBack.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/sdk/LoginResultCallBack.java
@@ -41,26 +41,24 @@
if (GlobalVariable.loginMap.containsKey(camera.getId())) {
GlobalVariable.loginMap.remove(camera.getId());
}
+ //鍒犻櫎绠＄悊閫氶亾
+ ardChannelService.deleteArdChannelByDeviceId(camera.getId());
if (dwResult == 1) {
GlobalVariable.loginMap.put(camera.getId(), lUserID);
log.debug(camera.getIp() + ":" + camera.getPort() + "鐧诲綍鎴愬姛");
camera.setLoginId(lUserID);
camera.setChanNum((int) lpDeviceinfo.byChanNum);
- camera.setStartDChan((int)lpDeviceinfo.byStartDChan);
-
+ camera.setStartDChan((int) lpDeviceinfo.byStartDChan);
//鑾峰彇鏈�鏂伴�氶亾
List<ArdChannel> cameraChannelList = hikClientService.getCameraChannelList(camera);
- if(cameraChannelList.size()>0) {
- //鍒犻櫎绠＄悊閫氶亾
- ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+ if (cameraChannelList.size() > 0) {
for (ArdChannel channel : cameraChannelList) {
channel.setId(IdUtils.simpleUUID());
ardChannelService.insertArdChannel(channel);
}
}
//鍒涘缓寮曞闃熷垪
- if(!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId()))
- {
+ if (!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId())) {
Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000, comparator);
GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue);
--
Gitblit v1.9.3