From 62f716be9cd1cee2a5fba566db3fcd43bd9fc4cc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 03 四月 2024 15:04:33 +0800
Subject: [PATCH] 添加idea logo
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 114 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 89 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 66dedf2..884036a 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -1,23 +1,33 @@
package com.genersoft.iot.vmp.conf;
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.text.SimpleDateFormat;
-import java.util.Date;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Pattern;
+
@Configuration("mediaConfig")
+@Order(0)
public class MediaConfig{
- @Value("${media.id:}")
+ private final static Logger logger = LoggerFactory.getLogger(MediaConfig.class);
+
+ // 淇敼蹇呴』閰嶇疆锛屼笉鍐嶆敮鎸佽嚜鍔ㄨ幏鍙�
+ @Value("${media.id}")
private String id;
@Value("${media.ip}")
private String ip;
- @Value("${media.hook-ip:${sip.ip}}")
+ @Value("${media.hook-ip:}")
private String hookIp;
@Value("${sip.ip}")
@@ -59,17 +69,23 @@
@Value("${media.secret}")
private String secret;
- @Value("${media.stream-none-reader-delay-ms:18000}")
- private String streamNoneReaderDelayMS = "18000";
-
@Value("${media.rtp.enable}")
private boolean rtpEnable;
@Value("${media.rtp.port-range}")
private String rtpPortRange;
+ @Value("${media.rtp.send-port-range}")
+ 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;
@@ -80,7 +96,7 @@
}
public String getHookIp() {
- if (StringUtils.isEmpty(hookIp)){
+ if (ObjectUtils.isEmpty(hookIp)){
return sipIp;
}else {
return hookIp;
@@ -89,7 +105,11 @@
}
public String getSipIp() {
- return sipIp;
+ if (sipIp == null) {
+ return this.ip;
+ }else {
+ return sipIp;
+ }
}
public int getHttpPort() {
@@ -133,10 +153,6 @@
return secret;
}
- public String getStreamNoneReaderDelayMS() {
- return streamNoneReaderDelayMS;
- }
-
public boolean isRtpEnable() {
return rtpEnable;
}
@@ -150,19 +166,34 @@
}
public String getSdpIp() {
- if (StringUtils.isEmpty(sdpIp)){
+ if (ObjectUtils.isEmpty(sdpIp)){
return ip;
}else {
- return sdpIp;
+ if (isValidIPAddress(sdpIp)) {
+ return sdpIp;
+ }else {
+ // 鎸夌収鍩熷悕瑙ｆ瀽
+ String hostAddress = null;
+ try {
+ hostAddress = InetAddress.getByName(sdpIp).getHostAddress();
+ } catch (UnknownHostException e) {
+ logger.error("[鑾峰彇SDP IP]: 鍩熷悕瑙ｆ瀽澶辫触");
+ }
+ return hostAddress;
+ }
}
}
public String getStreamIp() {
- if (StringUtils.isEmpty(streamIp)){
+ if (ObjectUtils.isEmpty(streamIp)){
return ip;
}else {
return streamIp;
}
+ }
+
+ public String getSipDomain() {
+ return sipDomain;
}
public MediaServerItem getMediaSerItem(){
@@ -171,27 +202,60 @@
mediaServerItem.setIp(ip);
mediaServerItem.setDefaultServer(true);
mediaServerItem.setHookIp(getHookIp());
- mediaServerItem.setSdpIp(sdpIp);
- mediaServerItem.setStreamIp(streamIp);
+ mediaServerItem.setSdpIp(getSdpIp());
+ mediaServerItem.setStreamIp(getStreamIp());
mediaServerItem.setHttpPort(httpPort);
mediaServerItem.setHttpSSlPort(httpSSlPort);
mediaServerItem.setRtmpPort(rtmpPort);
mediaServerItem.setRtmpSSlPort(rtmpSSlPort);
- mediaServerItem.setRtpProxyPort(rtpProxyPort);
+ mediaServerItem.setRtpProxyPort(getRtpProxyPort());
mediaServerItem.setRtspPort(rtspPort);
mediaServerItem.setRtspSSLPort(rtspSSLPort);
mediaServerItem.setAutoConfig(autoConfig);
mediaServerItem.setSecret(secret);
- mediaServerItem.setStreamNoneReaderDelayMS(streamNoneReaderDelayMS);
mediaServerItem.setRtpEnable(rtpEnable);
mediaServerItem.setRtpPortRange(rtpPortRange);
+ mediaServerItem.setSendRtpPortRange(rtpSendPortRange);
mediaServerItem.setRecordAssistPort(recordAssistPort);
-
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- mediaServerItem.setCreateTime(format.format(new Date(System.currentTimeMillis())));
- mediaServerItem.setUpdateTime(format.format(new Date(System.currentTimeMillis())));
+ 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) {
+ if ((ipAddress != null) && (!ipAddress.isEmpty())) {
+ return Pattern.matches("^([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}$", ipAddress);
+ }
+ return false;
+ }
}
--
Gitblit v1.8.0