From bfcb4d23351c5eb8db753ed8670a0d16601c1992 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 一月 2022 16:39:32 +0800
Subject: [PATCH] 合并主分支
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..41c59aa 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -40,7 +40,7 @@
MediaServerItem getMediaServerForMinimumLoad();
- void setZLMConfig(MediaServerItem mediaServerItem);
+ void setZLMConfig(MediaServerItem mediaServerItem, boolean restart);
SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId);
@@ -76,5 +76,5 @@
MediaServerItem getDefaultMediaServer();
- void updateMediaServerKeepalive(String zlmServerConfig, JSONObject data);
+ void updateMediaServerKeepalive(String mediaServerId, JSONObject data);
}
--
Gitblit v1.8.0