From 1fcdf5a8f369e020e78d524db2fe3cc7ffc86293 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 08 三月 2024 09:30:48 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 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 8cfdd88..2e6151d 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -45,8 +45,10 @@
void updateVmServer(List<MediaServerItem> mediaServerItemList);
- SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String ssrc, boolean ssrcCheck,
- boolean isPlayback, Integer port, Boolean reUsePort, Integer tcpMode);
+ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String presetSsrc, boolean ssrcCheck,
+ boolean isPlayback, Integer port, Boolean onlyAuto, Boolean reUsePort, Integer tcpMode);
+
+ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String ssrc, boolean ssrcCheck, boolean isPlayback, Integer port, Boolean onlyAuto);
void closeRTPServer(MediaServerItem mediaServerItem, String streamId);
@@ -87,21 +89,12 @@
void updateMediaServerKeepalive(String mediaServerId, ServerKeepaliveData data);
- boolean checkRtpServer(MediaServerItem mediaServerItem, String rtp, String stream);
-
/**
* 鑾峰彇璐熻浇淇℃伅
* @return
*/
MediaServerLoad getLoad(MediaServerItem mediaServerItem);
- /**
- * 鎸夋椂闂存煡鎵惧綍鍍忔枃浠�
- */
- List<RecordFile> getRecords(String app, String stream, String startTime, String endTime, List<MediaServerItem> mediaServerItems);
+ List<MediaServerItem> getAllWithAssistPort();
- /**
- * 鏌ユ壘瀛樺湪褰曞儚鏂囦欢鐨勬椂闂�
- */
- List<String> getRecordDates(String app, String stream, int year, int month, List<MediaServerItem> mediaServerItems);
}
--
Gitblit v1.8.0