From 33b51c40ddd9750a19b2c6a6618fb22386f87cd7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 13 十一月 2020 18:12:21 +0800
Subject: [PATCH] 增加强制不查询编码信息配置
---
src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java | 83 +++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java
index 738dd3a..76390e4 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java
@@ -31,8 +31,9 @@
@JSONField(name = "general.streamNoneReaderDelayMS")
private String generalStreamNoneReaderDelayMS;
- @JSONField(name = "general.localIP")
private String localIP;
+
+ private String wanIp;
@JSONField(name = "hls.fileBufSize")
private String hlsFileBufSize;
@@ -270,6 +271,14 @@
public void setGeneralStreamNoneReaderDelayMS(String generalStreamNoneReaderDelayMS) {
this.generalStreamNoneReaderDelayMS = generalStreamNoneReaderDelayMS;
+ }
+
+ public String getLocalIP() {
+ return localIP;
+ }
+
+ public void setLocalIP(String localIP) {
+ this.localIP = localIP;
}
public String getHlsFileBufSize() {
@@ -624,6 +633,38 @@
this.rtpVideoMtuSize = rtpVideoMtuSize;
}
+ public String getRtpProxyCheckSource() {
+ return rtpProxyCheckSource;
+ }
+
+ public void setRtpProxyCheckSource(String rtpProxyCheckSource) {
+ this.rtpProxyCheckSource = rtpProxyCheckSource;
+ }
+
+ public String getRtpProxyDumpDir() {
+ return rtpProxyDumpDir;
+ }
+
+ public void setRtpProxyDumpDir(String rtpProxyDumpDir) {
+ this.rtpProxyDumpDir = rtpProxyDumpDir;
+ }
+
+ public String getRtpProxyPort() {
+ return rtpProxyPort;
+ }
+
+ public void setRtpProxyPort(String rtpProxyPort) {
+ this.rtpProxyPort = rtpProxyPort;
+ }
+
+ public String getRtpProxyTimeoutSec() {
+ return rtpProxyTimeoutSec;
+ }
+
+ public void setRtpProxyTimeoutSec(String rtpProxyTimeoutSec) {
+ this.rtpProxyTimeoutSec = rtpProxyTimeoutSec;
+ }
+
public String getRtspAuthBasic() {
return rtspAuthBasic;
}
@@ -680,43 +721,11 @@
this.shellPhell = shellPhell;
}
- public String getLocalIP() {
- return localIP;
+ public String getWanIp() {
+ return wanIp;
}
- public void setLocalIP(String localIP) {
- this.localIP = localIP;
- }
-
- public String getRtpProxyCheckSource() {
- return rtpProxyCheckSource;
- }
-
- public void setRtpProxyCheckSource(String rtpProxyCheckSource) {
- this.rtpProxyCheckSource = rtpProxyCheckSource;
- }
-
- public String getRtpProxyDumpDir() {
- return rtpProxyDumpDir;
- }
-
- public void setRtpProxyDumpDir(String rtpProxyDumpDir) {
- this.rtpProxyDumpDir = rtpProxyDumpDir;
- }
-
- public String getRtpProxyPort() {
- return rtpProxyPort;
- }
-
- public void setRtpProxyPort(String rtpProxyPort) {
- this.rtpProxyPort = rtpProxyPort;
- }
-
- public String getRtpProxyTimeoutSec() {
- return rtpProxyTimeoutSec;
- }
-
- public void setRtpProxyTimeoutSec(String rtpProxyTimeoutSec) {
- this.rtpProxyTimeoutSec = rtpProxyTimeoutSec;
+ public void setWanIp(String wanIp) {
+ this.wanIp = wanIp;
}
}
--
Gitblit v1.8.0