From 8f7e8efc981cf68a3067fb3421fdfbbf6f6275ab Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 23 八月 2022 11:48:31 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 3a4c3ee..9638415 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.service;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
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;
@@ -42,11 +41,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, String ssrc);
+ 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,11 +59,11 @@
void removeCount(String mediaServerId);
- void releaseSsrc(MediaServerItem mediaServerItem, String ssrc);
+ void releaseSsrc(String mediaServerItemId, String ssrc);
void clearMediaServerForOnline();
- WVPResult<String> add(MediaServerItem mediaSerItem);
+ void add(MediaServerItem mediaSerItem);
int addToDatabase(MediaServerItem mediaSerItem);
@@ -68,12 +71,14 @@
void resetOnlineServerItem(MediaServerItem serverItem);
- WVPResult<MediaServerItem> checkMediaServer(String ip, int port, String secret);
+ MediaServerItem checkMediaServer(String ip, int port, String secret);
boolean checkMediaRecordServer(String ip, int port);
void delete(String id);
+ void deleteDb(String id);
+
MediaServerItem getDefaultMediaServer();
void updateMediaServerKeepalive(String mediaServerId, JSONObject data);
--
Gitblit v1.8.0