From e5cba6022fa49747eecba79d4490bc10187befd7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 01 八月 2023 10:28:41 +0800
Subject: [PATCH] Merge branch '2.6.8' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java | 10 ----------
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 24 ++++++++++++++++++------
src/main/resources/all-application.yml | 3 ---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java | 21 +++++++--------------
4 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
index 55bf371..5400729 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -43,8 +43,6 @@
private Boolean pushAuthority = Boolean.TRUE;
- private Boolean gbSendStreamStrict = Boolean.FALSE;
-
private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
private Boolean sipLog = Boolean.FALSE;
@@ -204,14 +202,6 @@
public void setPushAuthority(Boolean pushAuthority) {
this.pushAuthority = pushAuthority;
- }
-
- public Boolean getGbSendStreamStrict() {
- return gbSendStreamStrict;
- }
-
- public void setGbSendStreamStrict(Boolean gbSendStreamStrict) {
- this.gbSendStreamStrict = gbSendStreamStrict;
}
public Boolean getSyncChannelOnDeviceOnline() {
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
index c190de1..bec072c 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
@@ -164,13 +164,9 @@
public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId,
String deviceId, String channelId, boolean tcp, boolean rtcp){
- // 榛樿涓洪殢鏈虹鍙�
- int localPort = 0;
- if (userSetting.getGbSendStreamStrict()) {
- localPort = sendRtpPortManager.getNextPort(serverItem);
- if (localPort == 0) {
- return null;
- }
+ int localPort = sendRtpPortManager.getNextPort(serverItem);
+ if (localPort == 0) {
+ return null;
}
SendRtpItem sendRtpItem = new SendRtpItem();
sendRtpItem.setIp(ip);
@@ -200,13 +196,10 @@
*/
public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId,
String app, String stream, String channelId, boolean tcp, boolean rtcp){
- // 榛樿涓洪殢鏈虹鍙�
- int localPort = 0;
- if (userSetting.getGbSendStreamStrict()) {
- localPort = sendRtpPortManager.getNextPort(serverItem);
- if (localPort == 0) {
- return null;
- }
+
+ int localPort = sendRtpPortManager.getNextPort(serverItem);
+ if (localPort == 0) {
+ return null;
}
SendRtpItem sendRtpItem = new SendRtpItem();
sendRtpItem.setIp(ip);
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
index 39f6388..ddf677c 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
@@ -133,17 +133,29 @@
result.put("ChannelName", deviceChannel.getName());
result.put("ChannelCustomName", "");
result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl());
- result.put("HTTPS_FLV", inviteInfo.getStreamInfo().getHttps_flv().getUrl());
+ if(inviteInfo.getStreamInfo().getHttps_flv() != null) {
+ result.put("HTTPS_FLV", inviteInfo.getStreamInfo().getHttps_flv().getUrl());
+ }
result.put("WS_FLV", inviteInfo.getStreamInfo().getWs_flv().getUrl());
- result.put("WSS_FLV", inviteInfo.getStreamInfo().getWss_flv().getUrl());
+ if(inviteInfo.getStreamInfo().getWss_flv() != null) {
+ result.put("WSS_FLV", inviteInfo.getStreamInfo().getWss_flv().getUrl());
+ }
result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl());
- result.put("RTMPS", inviteInfo.getStreamInfo().getRtmps().getUrl());
+ if (inviteInfo.getStreamInfo().getRtmps() != null) {
+ result.put("RTMPS", inviteInfo.getStreamInfo().getRtmps().getUrl());
+ }
result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl());
- result.put("HTTPS_HLS", inviteInfo.getStreamInfo().getHttps_hls().getUrl());
+ if (inviteInfo.getStreamInfo().getHttps_hls() != null) {
+ result.put("HTTPS_HLS", inviteInfo.getStreamInfo().getHttps_hls().getUrl());
+ }
result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl());
- result.put("RTSPS", inviteInfo.getStreamInfo().getRtsps().getUrl());
+ if (inviteInfo.getStreamInfo().getRtsps() != null) {
+ result.put("RTSPS", inviteInfo.getStreamInfo().getRtsps().getUrl());
+ }
result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().getUrl());
- result.put("HTTPS_WEBRTC", inviteInfo.getStreamInfo().getRtcs().getUrl());
+ if (inviteInfo.getStreamInfo().getRtcs() != null) {
+ result.put("HTTPS_WEBRTC", inviteInfo.getStreamInfo().getRtcs().getUrl());
+ }
result.put("CDN", "");
result.put("SnapURL", "");
result.put("Transport", device.getTransport());
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 99caa02..695bc74 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -187,9 +187,6 @@
stream-on-demand: true
# 鎺ㄦ祦閴存潈锛� 榛樿寮�鍚�
push-authority: true
- # 鍥芥爣绾ц仈鍙戞祦涓ユ牸妯″紡锛屼弗鏍兼ā寮忎細浣跨敤涓巗dp淇℃伅涓竴鑷寸殑绔彛鍙戞祦锛岀鍙ｅ叡浜玬edia.rtp.port-range锛岃繖浼氭崯澶变竴浜涙�ц兘锛�
- # 闈炰弗鏍兼ā寮忎娇鐢ㄩ殢鏈虹鍙ｅ彂娴侊紝鎬ц兘鏇村ソ锛� 榛樿鍏抽棴
- gb-send-stream-strict: false
# 璁惧涓婄嚎鏃舵槸鍚﹁嚜鍔ㄥ悓姝ラ�氶亾
sync-channel-on-device-online: false
# 鏄惁浣跨敤璁惧鏉ユ簮Ip浣滀负鍥炲IP锛� 涓嶈缃垯涓� false
--
Gitblit v1.8.0