From e5370bbd6e74b7746db12ced5302ef97ef58a4ce Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期四, 03 三月 2022 19:52:16 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 20339a9..3f549e5 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -11,7 +11,8 @@
@Configuration("mediaConfig")
public class MediaConfig{
- @Value("${media.id:}")
+ // 淇敼蹇呴』閰嶇疆锛屼笉鍐嶆敮鎸佽嚜鍔ㄨ幏鍙�
+ @Value("${media.id}")
private String id;
@Value("${media.ip}")
@@ -60,7 +61,7 @@
private String secret;
@Value("${media.stream-none-reader-delay-ms:18000}")
- private String streamNoneReaderDelayMS = "18000";
+ private int streamNoneReaderDelayMS = 18000;
@Value("${media.rtp.enable}")
private boolean rtpEnable;
@@ -141,7 +142,7 @@
return secret;
}
- public String getStreamNoneReaderDelayMS() {
+ public int getStreamNoneReaderDelayMS() {
return streamNoneReaderDelayMS;
}
@@ -203,6 +204,7 @@
mediaServerItem.setRtpPortRange(rtpPortRange);
mediaServerItem.setSendRtpPortRange(sendRtpPortRange);
mediaServerItem.setRecordAssistPort(recordAssistPort);
+ mediaServerItem.setHookAliveInterval(120);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
mediaServerItem.setCreateTime(format.format(System.currentTimeMillis()));
--
Gitblit v1.8.0