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 | 75 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 25 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 c24e0ca..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,9 +2,12 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.utils.DateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
+import org.springframework.core.annotation.Order;
+import org.springframework.util.ObjectUtils;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -12,7 +15,10 @@
@Configuration("mediaConfig")
+@Order(0)
public class MediaConfig{
+
+ private final static Logger logger = LoggerFactory.getLogger(MediaConfig.class);
// 淇敼蹇呴』閰嶇疆锛屼笉鍐嶆敮鎸佽嚜鍔ㄨ幏鍙�
@Value("${media.id}")
@@ -21,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}")
@@ -63,21 +69,23 @@
@Value("${media.secret}")
private String secret;
- @Value("${media.stream-none-reader-delay-ms:10000}")
- private int streamNoneReaderDelayMS = 10000;
-
@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;
@@ -88,8 +96,8 @@
}
public String getHookIp() {
- if (StringUtils.isEmpty(hookIp)){
- return sipIp;
+ if (ObjectUtils.isEmpty(hookIp)){
+ return sipIp.split(",")[0];
}else {
return hookIp;
}
@@ -145,10 +153,6 @@
return secret;
}
- public int getStreamNoneReaderDelayMS() {
- return streamNoneReaderDelayMS;
- }
-
public boolean isRtpEnable() {
return rtpEnable;
}
@@ -162,7 +166,7 @@
}
public String getSdpIp() {
- if (StringUtils.isEmpty(sdpIp)){
+ if (ObjectUtils.isEmpty(sdpIp)){
return ip;
}else {
if (isValidIPAddress(sdpIp)) {
@@ -173,7 +177,7 @@
try {
hostAddress = InetAddress.getByName(sdpIp).getHostAddress();
} catch (UnknownHostException e) {
- throw new RuntimeException(e);
+ logger.error("[鑾峰彇SDP IP]: 鍩熷悕瑙ｆ瀽澶辫触");
}
return hostAddress;
}
@@ -181,7 +185,7 @@
}
public String getStreamIp() {
- if (StringUtils.isEmpty(streamIp)){
+ if (ObjectUtils.isEmpty(streamIp)){
return ip;
}else {
return streamIp;
@@ -190,10 +194,6 @@
public String getSipDomain() {
return sipDomain;
- }
-
- public String getSendRtpPortRange() {
- return sendRtpPortRange;
}
public MediaServerItem getMediaSerItem(){
@@ -213,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) {
@@ -232,5 +258,4 @@
}
return false;
}
-
}
--
Gitblit v1.8.0