From c21d973977a9f1d00d26179de764687ddd0ec56c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 24 四月 2024 14:59:41 +0800
Subject: [PATCH] 修复收到catalog消息是更新导致是否有音频的设置失效的BUG
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 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..972db32 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -6,7 +6,6 @@
import com.genersoft.iot.vmp.media.zlm.dto.ServerKeepaliveData;
import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
-import com.genersoft.iot.vmp.vmanager.bean.RecordFile;
import java.util.List;
@@ -45,8 +44,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 +88,13 @@
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);
+ MediaServerItem getMediaServerByAppAndStream(String app, String stream);
}
--
Gitblit v1.8.0