From 63a35ffaaf248f1c6eb7d660e9d3dba5d664eed7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 22 三月 2024 17:44:42 +0800
Subject: [PATCH] 调整节点管理代码结构
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java | 12 ++++++------
src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaNodeServerService.java | 42 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaNodeServerService.java b/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaNodeServerService.java
index 59b1c8d..9c2bb90 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaNodeServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaNodeServerService.java
@@ -5,9 +5,11 @@
import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.media.service.IMediaNodeServerService;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
@Service("abl")
public class ABLMediaNodeServerService implements IMediaNodeServerService {
@@ -81,4 +83,44 @@
public MediaInfo getMediaInfo(MediaServer mediaServerItem, String app, String stream) {
return null;
}
+
+ @Override
+ public Boolean pauseRtpCheck(MediaServer mediaServer, String streamKey) {
+ return null;
+ }
+
+ @Override
+ public Boolean resumeRtpCheck(MediaServer mediaServer, String streamKey) {
+ return null;
+ }
+
+ @Override
+ public String getFfmpegCmd(MediaServer mediaServer, String cmdKey) {
+ return null;
+ }
+
+ @Override
+ public WVPResult<String> addFFmpegSource(MediaServer mediaServer, String srcUrl, String dstUrl, int timeoutMs, boolean enableAudio, boolean enableMp4, String ffmpegCmdKey) {
+ return null;
+ }
+
+ @Override
+ public WVPResult<String> addStreamProxy(MediaServer mediaServer, String app, String stream, String url, boolean enableAudio, boolean enableMp4, String rtpType) {
+ return null;
+ }
+
+ @Override
+ public Boolean delFFmpegSource(MediaServer mediaServer, String streamKey) {
+ return null;
+ }
+
+ @Override
+ public Boolean delStreamProxy(MediaServer mediaServer, String streamKey) {
+ return null;
+ }
+
+ @Override
+ public Map<String, String> getFFmpegCMDs(MediaServer mediaServer) {
+ return null;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
index b2bfaf1..86faa25 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
@@ -210,22 +210,22 @@
}, (int)(mediaServerItem.getHookAliveInterval() * 2 * 1000));
}
private void initPort(MediaServer mediaServerItem, ZLMServerConfig zlmServerConfig) {
- if (mediaServerItem.getHttpSSlPort() == 0) {
+ if (mediaServerItem.getHttpSSlPort() != 0) {
mediaServerItem.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
}
- if (mediaServerItem.getRtmpPort() == 0) {
+ if (mediaServerItem.getRtmpPort() != 0) {
mediaServerItem.setRtmpPort(zlmServerConfig.getRtmpPort());
}
- if (mediaServerItem.getRtmpSSlPort() == 0) {
+ if (mediaServerItem.getRtmpSSlPort() != 0) {
mediaServerItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
}
- if (mediaServerItem.getRtspPort() == 0) {
+ if (mediaServerItem.getRtspPort() != 0) {
mediaServerItem.setRtspPort(zlmServerConfig.getRtspPort());
}
- if (mediaServerItem.getRtspSSLPort() == 0) {
+ if (mediaServerItem.getRtspSSLPort() != 0) {
mediaServerItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
}
- if (mediaServerItem.getRtpProxyPort() == 0) {
+ if (mediaServerItem.getRtpProxyPort() != 0) {
mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
}
mediaServerItem.setHookAliveInterval(10F);
--
Gitblit v1.8.0