From 2f76fa98bb839ede5b47a3c3e1bb6fe499952203 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 08 九月 2022 09:46:35 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 8 ++++++--
1 files changed, 6 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 1a9c8c7..7bc9ea2 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -47,6 +47,8 @@
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);
@@ -61,7 +63,7 @@
void clearMediaServerForOnline();
- WVPResult<String> add(MediaServerItem mediaSerItem);
+ void add(MediaServerItem mediaSerItem);
int addToDatabase(MediaServerItem mediaSerItem);
@@ -69,7 +71,7 @@
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);
@@ -80,4 +82,6 @@
MediaServerItem getDefaultMediaServer();
void updateMediaServerKeepalive(String mediaServerId, JSONObject data);
+
+ boolean checkRtpServer(MediaServerItem mediaServerItem, String rtp, String stream);
}
--
Gitblit v1.8.0