From 619a66f9998fa646a69903a4c22e2bbf92e2221b Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期三, 28 七月 2021 09:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 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
index 7a57bed..f9e3ebf 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -1,10 +1,9 @@
package com.genersoft.iot.vmp.service;
-import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
-import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import java.util.List;
@@ -13,11 +12,13 @@
*/
public interface IMediaServerService {
- List<IMediaServerItem> getAll();
+ List<MediaServerItem> getAll();
- IMediaServerItem getOne(String generalMediaServerId);
+ List<MediaServerItem> getAllOnline();
- IMediaServerItem getOneByHostAndPort(String host, int port);
+ MediaServerItem getOne(String generalMediaServerId);
+
+ MediaServerItem getOneByHostAndPort(String host, int port);
/**
* 鏂扮殑鑺傜偣鍔犲叆
@@ -26,19 +27,27 @@
*/
void handLeZLMServerConfig(ZLMServerConfig zlmServerConfig);
- void updateServerCatch(IMediaServerItem mediaServerItem, Integer count, Boolean b);
+ MediaServerItem getMediaServerForMinimumLoad();
- IMediaServerItem getMediaServerForMinimumLoad();
+ void setZLMConfig(MediaServerItem mediaServerItem);
- void setZLMConfig(IMediaServerItem mediaServerItem);
-
- void init();
+ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId);
void closeRTPServer(Device device, String channelId);
- void update(MediaConfig mediaConfig);
+ void clearRTPServer(MediaServerItem mediaServerItem);
+
+ void update(MediaServerItem mediaSerItem);
void addCount(String mediaServerId);
void removeCount(String mediaServerId);
+
+ void releaseSsrc(MediaServerItem mediaServerItem, String ssrc);
+
+ void clearMediaServerForOnline();
+
+ void add(MediaServerItem mediaSerItem);
+
+ void resetOnlineServerItem(MediaServerItem serverItem);
}
--
Gitblit v1.8.0