From 381c3bdc2079ece5147cf4cee004e9071edadf7a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 04 五月 2023 16:04:44 +0800
Subject: [PATCH] 修复国标点播下级平台，ssrc更新的时单端口错误更新rtpserver的问题
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 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 708f72b..fa12679 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.junit.jupiter.api.Order;
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;
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}")
@@ -75,10 +75,6 @@
@Value("${media.rtp.port-range}")
private String rtpPortRange;
-
- @Value("${media.rtp.send-port-range}")
- private String sendRtpPortRange;
-
@Value("${media.record-assist-port:0}")
private Integer recordAssistPort = 0;
@@ -92,7 +88,7 @@
public String getHookIp() {
if (ObjectUtils.isEmpty(hookIp)){
- return sipIp;
+ return sipIp.split(",")[0];
}else {
return hookIp;
}
@@ -191,10 +187,6 @@
return sipDomain;
}
- public String getSendRtpPortRange() {
- return sendRtpPortRange;
- }
-
public MediaServerItem getMediaSerItem(){
MediaServerItem mediaServerItem = new MediaServerItem();
mediaServerItem.setId(id);
@@ -214,9 +206,8 @@
mediaServerItem.setSecret(secret);
mediaServerItem.setRtpEnable(rtpEnable);
mediaServerItem.setRtpPortRange(rtpPortRange);
- mediaServerItem.setSendRtpPortRange(sendRtpPortRange);
mediaServerItem.setRecordAssistPort(recordAssistPort);
- mediaServerItem.setHookAliveInterval(120);
+ mediaServerItem.setHookAliveInterval(30.00f);
mediaServerItem.setCreateTime(DateUtil.getNow());
mediaServerItem.setUpdateTime(DateUtil.getNow());
--
Gitblit v1.8.0