From dabee4ed7d503a06a78a7c12491416206a48eec1 Mon Sep 17 00:00:00 2001
From: XiaoQiTong <69035114+XiaoQiTong@users.noreply.github.com>
Date: 星期六, 15 十月 2022 20:57:24 +0800
Subject: [PATCH] 增加指定流媒体收流功能
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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..35ff08e 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -2,8 +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.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.net.InetAddress;
@@ -13,6 +17,8 @@
@Configuration("mediaConfig")
public class MediaConfig{
+
+ private final static Logger logger = LoggerFactory.getLogger(MediaConfig.class);
// 淇敼蹇呴』閰嶇疆锛屼笉鍐嶆敮鎸佽嚜鍔ㄨ幏鍙�
@Value("${media.id}")
@@ -63,8 +69,8 @@
@Value("${media.secret}")
private String secret;
- @Value("${media.stream-none-reader-delay-ms:10000}")
- private int streamNoneReaderDelayMS = 10000;
+ @Value("${media.stream-none-reader-delay-ms:15000}")
+ private int streamNoneReaderDelayMS = 15000;
@Value("${media.rtp.enable}")
private boolean rtpEnable;
@@ -88,7 +94,7 @@
}
public String getHookIp() {
- if (StringUtils.isEmpty(hookIp)){
+ if (ObjectUtils.isEmpty(hookIp)){
return sipIp;
}else {
return hookIp;
@@ -162,7 +168,7 @@
}
public String getSdpIp() {
- if (StringUtils.isEmpty(sdpIp)){
+ if (ObjectUtils.isEmpty(sdpIp)){
return ip;
}else {
if (isValidIPAddress(sdpIp)) {
@@ -173,7 +179,7 @@
try {
hostAddress = InetAddress.getByName(sdpIp).getHostAddress();
} catch (UnknownHostException e) {
- throw new RuntimeException(e);
+ logger.error("[鑾峰彇SDP IP]: 鍩熷悕瑙ｆ瀽澶辫触");
}
return hostAddress;
}
@@ -181,7 +187,7 @@
}
public String getStreamIp() {
- if (StringUtils.isEmpty(streamIp)){
+ if (ObjectUtils.isEmpty(streamIp)){
return ip;
}else {
return streamIp;
--
Gitblit v1.8.0