From ee746e53cda8e35ede1d966b582160caeb1ca562 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 04 三月 2022 15:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitee.com/wvp-pro-record' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 fcba07f..8c12c78 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -22,7 +22,7 @@
MediaServerItem getOne(String generalMediaServerId);
- MediaServerItem getOneByHostAndPort(String host, int port);
+ void syncCatchFromDatabase();
/**
* 鏂扮殑鑺傜偣鍔犲叆
@@ -40,13 +40,15 @@
MediaServerItem getMediaServerForMinimumLoad();
- void setZLMConfig(MediaServerItem mediaServerItem);
+ void setZLMConfig(MediaServerItem mediaServerItem, boolean restart);
+
+ void updateVmServer(List<MediaServerItem> mediaServerItemList);
SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId);
SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean isPlayback);
- void closeRTPServer(Device device, String channelId);
+ void closeRTPServer(String deviceId, String channelId, String ssrc);
void clearRTPServer(MediaServerItem mediaServerItem);
@@ -74,7 +76,9 @@
void delete(String id);
+ void deleteDb(String id);
+
MediaServerItem getDefaultMediaServer();
- void updateMediaServerKeepalive(String zlmServerConfig, JSONObject data);
+ void updateMediaServerKeepalive(String mediaServerId, JSONObject data);
}
--
Gitblit v1.8.0