From 8874c90db2c238fa4c55df491675fe7fec9d93b2 Mon Sep 17 00:00:00 2001
From: fine <54142345+criver31@users.noreply.github.com>
Date: 星期二, 09 一月 2024 11:45:30 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 63 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
index 35ff08e..96f3dfd 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -2,13 +2,12 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.utils.DateUtil;
-import com.genersoft.iot.vmp.vmanager.gb28181.device.DeviceQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -16,6 +15,7 @@
@Configuration("mediaConfig")
+@Order(0)
public class MediaConfig{
private final static Logger logger = LoggerFactory.getLogger(MediaConfig.class);
@@ -27,7 +27,7 @@
@Value("${media.ip}")
private String ip;
- @Value("${media.hook-ip:${sip.ip}}")
+ @Value("${media.hook-ip:}")
private String hookIp;
@Value("${sip.ip}")
@@ -69,21 +69,23 @@
@Value("${media.secret}")
private String secret;
- @Value("${media.stream-none-reader-delay-ms:15000}")
- private int streamNoneReaderDelayMS = 15000;
-
@Value("${media.rtp.enable}")
private boolean rtpEnable;
@Value("${media.rtp.port-range}")
private String rtpPortRange;
-
@Value("${media.rtp.send-port-range}")
- private String sendRtpPortRange;
+ private String rtpSendPortRange;
@Value("${media.record-assist-port:0}")
private Integer recordAssistPort = 0;
+
+ @Value("${media.record-day:7}")
+ private Integer recordDay;
+
+ @Value("${media.record-path}")
+ private String recordPath;
public String getId() {
return id;
@@ -95,7 +97,7 @@
public String getHookIp() {
if (ObjectUtils.isEmpty(hookIp)){
- return sipIp;
+ return sipIp.split(",")[0];
}else {
return hookIp;
}
@@ -151,10 +153,6 @@
return secret;
}
- public int getStreamNoneReaderDelayMS() {
- return streamNoneReaderDelayMS;
- }
-
public boolean isRtpEnable() {
return rtpEnable;
}
@@ -198,10 +196,6 @@
return sipDomain;
}
- public String getSendRtpPortRange() {
- return sendRtpPortRange;
- }
-
public MediaServerItem getMediaSerItem(){
MediaServerItem mediaServerItem = new MediaServerItem();
mediaServerItem.setId(id);
@@ -219,17 +213,43 @@
mediaServerItem.setRtspSSLPort(rtspSSLPort);
mediaServerItem.setAutoConfig(autoConfig);
mediaServerItem.setSecret(secret);
- mediaServerItem.setStreamNoneReaderDelayMS(streamNoneReaderDelayMS);
mediaServerItem.setRtpEnable(rtpEnable);
mediaServerItem.setRtpPortRange(rtpPortRange);
- mediaServerItem.setSendRtpPortRange(sendRtpPortRange);
+ mediaServerItem.setSendRtpPortRange(rtpSendPortRange);
mediaServerItem.setRecordAssistPort(recordAssistPort);
- mediaServerItem.setHookAliveInterval(120);
-
+ mediaServerItem.setHookAliveInterval(30.00f);
+ mediaServerItem.setRecordDay(recordDay);
+ if (recordPath != null) {
+ mediaServerItem.setRecordPath(recordPath);
+ }
mediaServerItem.setCreateTime(DateUtil.getNow());
mediaServerItem.setUpdateTime(DateUtil.getNow());
return mediaServerItem;
+ }
+
+ public Integer getRecordDay() {
+ return recordDay;
+ }
+
+ public void setRecordDay(Integer recordDay) {
+ this.recordDay = recordDay;
+ }
+
+ public String getRecordPath() {
+ return recordPath;
+ }
+
+ public void setRecordPath(String recordPath) {
+ this.recordPath = recordPath;
+ }
+
+ public String getRtpSendPortRange() {
+ return rtpSendPortRange;
+ }
+
+ public void setRtpSendPortRange(String rtpSendPortRange) {
+ this.rtpSendPortRange = rtpSendPortRange;
}
private boolean isValidIPAddress(String ipAddress) {
@@ -238,5 +258,4 @@
}
return false;
}
-
}
--
Gitblit v1.8.0