From ecd14d6757eb12e66d7668eff509c10875abf855 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 八月 2022 15:03:18 +0800
Subject: [PATCH] Merge pull request #578 from urmyfaith/patch-1
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 56ffbf0..e0f667b 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();
/**
* 鏂扮殑鑺傜偣鍔犲叆
@@ -42,11 +42,15 @@
void setZLMConfig(MediaServerItem mediaServerItem, boolean restart);
- SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId);
+ void updateVmServer(List<MediaServerItem> mediaServerItemList);
- SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean isPlayback);
+ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean ssrcCheck, boolean isPlayback);
- void closeRTPServer(Device device, String channelId);
+ 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);
+
+ void closeRTPServer(String deviceId, String channelId, String ssrc);
void clearRTPServer(MediaServerItem mediaServerItem);
@@ -56,7 +60,7 @@
void removeCount(String mediaServerId);
- void releaseSsrc(MediaServerItem mediaServerItem, String ssrc);
+ void releaseSsrc(String mediaServerItemId, String ssrc);
void clearMediaServerForOnline();
@@ -74,7 +78,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