From 019827fd35f84465ee503fcc248b12a045da44d2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 29 十一月 2021 18:09:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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
index f9e3ebf..657d280 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -4,6 +4,7 @@
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import java.util.List;
@@ -13,6 +14,8 @@
public interface IMediaServerService {
List<MediaServerItem> getAll();
+
+ List<MediaServerItem> getAllFromDatabase();
List<MediaServerItem> getAllOnline();
@@ -33,6 +36,8 @@
SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId);
+ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean isPlayback);
+
void closeRTPServer(Device device, String channelId);
void clearRTPServer(MediaServerItem mediaServerItem);
@@ -47,7 +52,15 @@
void clearMediaServerForOnline();
- void add(MediaServerItem mediaSerItem);
+ WVPResult<String> add(MediaServerItem mediaSerItem);
void resetOnlineServerItem(MediaServerItem serverItem);
+
+ WVPResult<MediaServerItem> checkMediaServer(String ip, int port, String secret);
+
+ boolean checkMediaRecordServer(String ip, int port);
+
+ void delete(String id);
+
+ MediaServerItem getDefaultMediaServer();
}
--
Gitblit v1.8.0