From dd4e0d0d9c75b5216b08644bfe1333a79f794b58 Mon Sep 17 00:00:00 2001
From: hexq <hexiaoqu@visioninsight.com>
Date: 星期六, 20 一月 2024 10:22:34 +0800
Subject: [PATCH] BUGFIX：向下级目录关联通道时，出现“未查询到目录xxx的信息"
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
old mode 100644
new mode 100755
index 0ecc717..941cf6f
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -1,11 +1,12 @@
package com.genersoft.iot.vmp.service;
-import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.ServerKeepaliveData;
+import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
-import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
+import com.genersoft.iot.vmp.vmanager.bean.RecordFile;
import java.util.List;
@@ -38,19 +39,19 @@
*/
void zlmServerOffline(String mediaServerId);
- MediaServerItem getMediaServerForMinimumLoad();
+ MediaServerItem getMediaServerForMinimumLoad(Boolean hasAssist);
void setZLMConfig(MediaServerItem mediaServerItem, boolean restart);
void updateVmServer(List<MediaServerItem> mediaServerItemList);
- SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean ssrcCheck, boolean isPlayback);
-
- SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String ssrc, boolean ssrcCheck, boolean isPlayback);
-
- SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String ssrc, boolean ssrcCheck, boolean isPlayback, Integer port);
+ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String ssrc, boolean ssrcCheck,
+ boolean isPlayback, Integer port, Boolean reUsePort, Integer tcpMode);
void closeRTPServer(MediaServerItem mediaServerItem, String streamId);
+
+ void closeRTPServer(MediaServerItem mediaServerItem, String streamId, CommonCallback<Boolean> callback);
+ Boolean updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc);
void closeRTPServer(String mediaServerId, String streamId);
@@ -84,7 +85,14 @@
MediaServerItem getDefaultMediaServer();
- void updateMediaServerKeepalive(String mediaServerId, JSONObject data);
+ void updateMediaServerKeepalive(String mediaServerId, ServerKeepaliveData data);
- boolean checkRtpServer(MediaServerItem mediaServerItem, String rtp, String stream);
+ /**
+ * 鑾峰彇璐熻浇淇℃伅
+ * @return
+ */
+ MediaServerLoad getLoad(MediaServerItem mediaServerItem);
+
+ List<MediaServerItem> getAllWithAssistPort();
+
}
--
Gitblit v1.8.0