From 7d3cbb8253ec3dc7f4004ae67371f852727909df Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 24 七月 2023 09:42:32 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java | 93 +++++++----
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java | 2
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 2
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 14 +
src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java | 4
src/main/java/com/genersoft/iot/vmp/common/CommonGbChannel.java | 191 +++++++++++++++++++++++
src/main/resources/all-application.yml | 4
src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java | 6
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 12 +
README.md | 4
/dev/null | 50 ------
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 2
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 28 ---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java | 4
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 42 ++--
15 files changed, 308 insertions(+), 150 deletions(-)
diff --git a/README.md b/README.md
index 7cac2b6..a29280b 100644
--- a/README.md
+++ b/README.md
@@ -107,6 +107,10 @@
- [X] 鏀寔Mysql锛孭ostgresql锛岄噾浠撶瓑鏁版嵁搴�
- [X] 鏀寔Onvif(鐩墠鍦╫nvif鍒嗘敮锛岄渶瑕佸畨瑁卭nvif鏈嶅姟锛屾湇鍔¤鍦ㄧ煡璇嗘槦鐞冭幏鍙�)
+# 闈炲紑婧愮殑鍐呭
+- [X] ONVIF璁惧鐨勬帴鍏ワ紝鏀寔鐐规挱锛屼簯鍙版帶鍒讹紝鍥芥爣绾ц仈鐐规挱锛岃嚜鍔ㄧ偣鎾�傚湪[鐭ヨ瘑鏄熺悆](https://t.zsxq.com/10WAnH2MP)鏀句簡璇曠敤瀹夎鍖呬互鍙婁娇鐢ㄦ暀绋嬶紝娌℃湁浣跨敤鏃堕棿闄愬埗锛岄渶瑕佹簮鐮佸彲浠ユ槦鐞冪淇℃垜鎴栬�呴偖绠辫仈绯汇��
+
+
# 鎺堟潈鍗忚
鏈」鐩嚜鏈変唬鐮佷娇鐢ㄥ鏉剧殑MIT鍗忚锛屽湪淇濈暀鐗堟潈淇℃伅鐨勬儏鍐典笅鍙互鑷敱搴旂敤浜庡悇鑷晢鐢ㄣ�侀潪鍟嗕笟鐨勯」鐩�� 浣嗘槸鏈」鐩篃闆剁鐨勪娇鐢ㄤ簡涓�浜涘叾浠栫殑寮�婧愪唬鐮侊紝鍦ㄥ晢鐢ㄧ殑鎯呭喌涓嬭鑷鏇夸唬鎴栧墧闄わ紱 鐢变簬浣跨敤鏈」鐩�屼骇鐢熺殑鍟嗕笟绾犵悍鎴栦镜鏉冭涓轰竴姒備笌鏈」鐩強寮�鍙戣�呮棤鍏筹紝璇疯嚜琛屾壙鎷呮硶寰嬮闄┿�� 鍦ㄤ娇鐢ㄦ湰椤圭洰浠ｇ爜鏃讹紝涔熷簲璇ュ湪鎺堟潈鍗忚涓悓鏃惰〃鏄庢湰椤圭洰渚濊禆鐨勭涓夋柟搴撶殑鍗忚
diff --git a/src/main/java/com/genersoft/iot/vmp/common/CommonGbChannel.java b/src/main/java/com/genersoft/iot/vmp/common/CommonGbChannel.java
new file mode 100644
index 0000000..b289a14
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/common/CommonGbChannel.java
@@ -0,0 +1,191 @@
+package com.genersoft.iot.vmp.common;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public class CommonGbChannel {
+
+ /**
+ * 鍥芥爣瀛楁锛氬綊灞�
+ */
+ @Schema(description = "褰掑睘")
+ private String owner;
+
+ /**
+ * 鍥芥爣瀛楁锛氳鏀垮尯鍒�
+ */
+ @Schema(description = "琛屾斂鍖哄垝")
+ private String civilCode;
+
+ /**
+ * 鍥芥爣瀛楁锛氬畨瑁呭湴鍧�
+ */
+ @Schema(description = "瀹夎鍦板潃")
+ private String address;
+
+ /**
+ * 鍥芥爣瀛楁锛氱粡搴�
+ */
+ @Schema(description = "缁忓害")
+ private Double longitude;
+
+ /**
+ * 鍥芥爣瀛楁锛氱含搴�
+ */
+ @Schema(description = "绾害")
+ private Double latitude;
+
+ /**
+ * 鍥芥爣瀛楁锛氭憚鍍忔満绫诲瀷:
+ * 1-鐞冩満;
+ * 2-鍗婄悆;
+ * 3-鍥哄畾鏋満;
+ * 4-閬ユ帶鏋満
+ */
+ @Schema(description = "鎽勫儚鏈虹被鍨�")
+ private Integer ptzType;
+
+ /**
+ * 鍥芥爣瀛楁锛氭憚鍍忔満浣嶇疆绫诲瀷鎵╁睍銆�
+ * 1-鐪侀檯妫�鏌ョ珯銆�
+ * 2-鍏氭斂鏈哄叧銆�
+ * 3-杞︾珯鐮佸ご銆�
+ * 4-涓績骞垮満銆�
+ * 5-浣撹偛鍦洪銆�
+ * 6-鍟嗕笟涓績銆�
+ * 7-瀹楁暀鍦烘墍銆�
+ * 8-鏍″洯鍛ㄨ竟銆�
+ * 9-娌诲畨澶嶆潅鍖哄煙銆�
+ * 10-浜ら�氬共绾�
+ */
+ @Schema(description = "鎽勫儚鏈轰綅缃被鍨嬫墿灞�")
+ private Integer positionType;
+
+ /**
+ * 鍥芥爣瀛楁锛氬畨瑁呬綅缃澶栥�佸鍐呭睘鎬�
+ * 1-瀹ゅ銆�
+ * 2-瀹ゅ唴
+ */
+ @Schema(description = "瀹夎浣嶇疆瀹ゅ銆佸鍐呭睘鎬�")
+ private Integer roomType;
+
+ /**
+ * 鍥芥爣瀛楁锛氱敤閫�
+ * 1-娌诲畨銆�
+ * 2-浜ら�氥��
+ * 3-閲嶇偣銆�
+ */
+ @Schema(description = "鐢ㄩ��")
+ private Integer useType;
+
+ /**
+ * 鍥芥爣瀛楁锛氳ˉ鍏夊睘鎬�
+ * 1-鏃犺ˉ鍏夈��
+ * 2-绾㈠琛ュ厜銆�
+ * 3-鐧藉厜琛ュ厜
+ */
+ @Schema(description = "琛ュ厜灞炴��")
+ private Integer supplyLightType;
+
+ /**
+ * 鎽勫儚鏈虹洃瑙嗘柟浣嶅睘鎬с��
+ * 1-涓溿��
+ * 2-瑗裤��
+ * 3-鍗椼��
+ * 4-鍖椼��
+ * 5-涓滃崡銆�
+ * 6-涓滃寳銆�
+ * 7-瑗垮崡銆�
+ * 8-瑗垮寳
+ *
+ */
+ @Schema(description = "鏂逛綅")
+ private Integer directionType;
+
+ public String getOwner() {
+ return owner;
+ }
+
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
+
+ public String getCivilCode() {
+ return civilCode;
+ }
+
+ public void setCivilCode(String civilCode) {
+ this.civilCode = civilCode;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public Double getLongitude() {
+ return longitude;
+ }
+
+ public void setLongitude(Double longitude) {
+ this.longitude = longitude;
+ }
+
+ public Double getLatitude() {
+ return latitude;
+ }
+
+ public void setLatitude(Double latitude) {
+ this.latitude = latitude;
+ }
+
+ public Integer getPtzType() {
+ return ptzType;
+ }
+
+ public void setPtzType(Integer ptzType) {
+ this.ptzType = ptzType;
+ }
+
+ public Integer getPositionType() {
+ return positionType;
+ }
+
+ public void setPositionType(Integer positionType) {
+ this.positionType = positionType;
+ }
+
+ public Integer getRoomType() {
+ return roomType;
+ }
+
+ public void setRoomType(Integer roomType) {
+ this.roomType = roomType;
+ }
+
+ public Integer getUseType() {
+ return useType;
+ }
+
+ public void setUseType(Integer useType) {
+ this.useType = useType;
+ }
+
+ public Integer getSupplyLightType() {
+ return supplyLightType;
+ }
+
+ public void setSupplyLightType(Integer supplyLightType) {
+ this.supplyLightType = supplyLightType;
+ }
+
+ public Integer getDirectionType() {
+ return directionType;
+ }
+
+ public void setDirectionType(Integer directionType) {
+ this.directionType = directionType;
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
index 90b5291..0c77fc1 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -63,7 +63,7 @@
private void addListeningPoint(String monitorIp, int port){
SipStackImpl sipStack;
try {
- sipStack = (SipStackImpl)SipFactory.getInstance().createSipStack(DefaultProperties.getProperties(monitorIp, userSetting.getSipLog()));
+ sipStack = (SipStackImpl)SipFactory.getInstance().createSipStack(DefaultProperties.getProperties("GB28181_SIP", userSetting.getSipLog()));
sipStack.setMessageParserFactory(new GbStringMsgParserFactory());
} catch (PeerUnavailableException e) {
logger.error("[SIP SERVER] SIP鏈嶅姟鍚姩澶辫触锛� 鐩戝惉鍦板潃{}澶辫触,璇锋鏌p鏄惁姝ｇ‘", monitorIp);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java b/src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java
index 7e355e5..e2c9ef5 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/conf/DefaultProperties.java
@@ -12,10 +12,10 @@
*/
public class DefaultProperties {
- public static Properties getProperties(String ip, boolean sipLog) {
+ public static Properties getProperties(String name, boolean sipLog) {
Properties properties = new Properties();
- properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP");
- properties.setProperty("javax.sip.IP_ADDRESS", ip);
+ properties.setProperty("javax.sip.STACK_NAME", name);
+// properties.setProperty("javax.sip.IP_ADDRESS", ip);
// 鍏抽棴鑷姩浼氳瘽
properties.setProperty("javax.sip.AUTOMATIC_DIALOG_SUPPORT", "off");
/**
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
index a08231c..8c96a8e 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
@@ -344,7 +344,7 @@
if (!ObjectUtils.isEmpty(civilCode)
&& civilCode.length() <= 8
&& NumberUtils.isParsable(civilCode)
- && Integer.parseInt(civilCode)%2 == 0
+ && civilCode.length()%2 == 0
) {
deviceChannel.setCivilCode(civilCode);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java
index 893e52a..f960c7d 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java
@@ -3,12 +3,14 @@
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaSendRtpPortInfo;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
+import org.apache.commons.lang3.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.support.atomic.RedisAtomicInteger;
import org.springframework.stereotype.Component;
import java.util.HashMap;
@@ -26,23 +28,14 @@
@Autowired
private RedisTemplate<Object, Object> redisTemplate;
- private final String KEY = "VM_MEDIA_SEND_RTP_PORT_RANGE_";
+ private final String KEY = "VM_MEDIA_SEND_RTP_PORT_";
-
- public void initServerPort(String mediaServerId, int startPort, int endPort){
- String key = KEY + userSetting.getServerId() + "_" + mediaServerId;
- MediaSendRtpPortInfo mediaSendRtpPortInfo = new MediaSendRtpPortInfo(startPort, endPort, mediaServerId);
- redisTemplate.opsForValue().set(key, mediaSendRtpPortInfo);
- }
-
- public int getNextPort(String mediaServerId) {
- String sendIndexKey = KEY + userSetting.getServerId() + "_" + mediaServerId;
- MediaSendRtpPortInfo mediaSendRtpPortInfo = (MediaSendRtpPortInfo)redisTemplate.opsForValue().get(sendIndexKey);
- if (mediaSendRtpPortInfo == null) {
- logger.warn("[鍙戦�佺鍙ｇ鐞哴 鑾峰彇{}鐨勫彂閫佺鍙ｆ椂鏈壘鍒扮鍙ｄ俊鎭�", mediaServerId);
- return 0;
+ public int getNextPort(MediaServerItem mediaServer) {
+ if (mediaServer == null) {
+ logger.warn("[鍙戦�佺鍙ｇ鐞哴 鍙傛暟閿欒锛宮ediaServer涓篘ULL");
+ return -1;
}
-
+ String sendIndexKey = KEY + userSetting.getServerId() + "_" + mediaServer.getId();
String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX
+ userSetting.getServerId() + "_*";
List<Object> queryResult = RedisUtil.scan(redisTemplate, key);
@@ -54,14 +47,39 @@
sendRtpItemMap.put(sendRtpItem.getLocalPort(), sendRtpItem);
}
}
+ String sendRtpPortRange = mediaServer.getSendRtpPortRange();
+ int startPort;
+ int endPort;
+ if (sendRtpPortRange == null) {
+ logger.warn("{}鏈缃彂閫佺鍙ｉ粯璁ゅ�硷紝鑷姩浣跨敤40000-50000浣滀负绔彛鑼冨洿", mediaServer.getId());
+ String[] portArray = sendRtpPortRange.split(",");
+ if (portArray.length != 2 || !NumberUtils.isParsable(portArray[0]) || !NumberUtils.isParsable(portArray[1])) {
+ logger.warn("{}鍙戦�佺鍙ｉ厤缃牸寮忛敊璇紝鑷姩浣跨敤40000-50000浣滀负绔彛鑼冨洿", mediaServer.getId());
+ startPort = 50000;
+ endPort = 60000;
+ }else {
- int port = getPort(mediaSendRtpPortInfo.getCurrent(),
- mediaSendRtpPortInfo.getStart(),
- mediaSendRtpPortInfo.getEnd(), checkPort -> sendRtpItemMap.get(checkPort) == null);
-
- mediaSendRtpPortInfo.setCurrent(port);
- redisTemplate.opsForValue().set(sendIndexKey, mediaSendRtpPortInfo);
- return port;
+ if ( Integer.parseInt(portArray[1]) - Integer.parseInt(portArray[0]) < 1) {
+ logger.warn("{}鍙戦�佺鍙ｉ厤缃敊璇�,缁撴潫绔彛鑷冲皯姣斿紑濮嬬鍙ｅぇ涓�锛岃嚜鍔ㄤ娇鐢�40000-50000浣滀负绔彛鑼冨洿", mediaServer.getId());
+ startPort = 50000;
+ endPort = 60000;
+ }else {
+ startPort = Integer.parseInt(portArray[0]);
+ endPort = Integer.parseInt(portArray[1]);
+ }
+ }
+ }else {
+ startPort = 50000;
+ endPort = 60000;
+ }
+ if (redisTemplate == null || redisTemplate.getConnectionFactory() == null) {
+ logger.warn("{}鑾峰彇redis杩炴帴淇℃伅澶辫触", mediaServer.getId());
+ return -1;
+ }
+ RedisAtomicInteger redisAtomicInteger = new RedisAtomicInteger(sendIndexKey , redisTemplate.getConnectionFactory());
+ return redisAtomicInteger.getAndUpdate((current)->{
+ return getPort(current, startPort, endPort, checkPort-> !sendRtpItemMap.containsKey(checkPort));
+ });
}
interface CheckPortCallback{
@@ -69,22 +87,25 @@
}
private int getPort(int current, int start, int end, CheckPortCallback checkPortCallback) {
- int port;
- if (current %2 != 0) {
- port = current + 1;
- }else {
- port = current + 2;
- }
- if (port > end) {
- if (start %2 != 0) {
- port = start + 1;
+ if (current <= 0) {
+ if (start%2 == 0) {
+ current = start;
}else {
- port = start;
+ current = start + 1;
+ }
+ }else {
+ current += 2;
+ if (current > end) {
+ if (start%2 == 0) {
+ current = start;
+ }else {
+ current = start + 1;
+ }
}
}
- if (!checkPortCallback.check(port)) {
- return getPort(port, start, end, checkPortCallback);
+ if (!checkPortCallback.check(current)) {
+ return getPort(current + 2, start, end, checkPortCallback);
}
- return port;
+ return current;
}
}
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 e0ac71f..81cae37 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
@@ -171,7 +171,7 @@
// 榛樿涓洪殢鏈虹鍙�
int localPort = 0;
if (userSetting.getGbSendStreamStrict()) {
- localPort = sendRtpPortManager.getNextPort(serverItem.getId());
+ localPort = sendRtpPortManager.getNextPort(serverItem);
if (localPort == 0) {
return null;
}
@@ -207,7 +207,7 @@
// 榛樿涓洪殢鏈虹鍙�
int localPort = 0;
if (userSetting.getGbSendStreamStrict()) {
- localPort = sendRtpPortManager.getNextPort(serverItem.getId());
+ localPort = sendRtpPortManager.getNextPort(serverItem);
if (localPort == 0) {
return null;
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaSendRtpPortInfo.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaSendRtpPortInfo.java
deleted file mode 100644
index 2e9f631..0000000
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaSendRtpPortInfo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.genersoft.iot.vmp.media.zlm.dto;
-
-public class MediaSendRtpPortInfo {
-
- private int start;
- private int end;
- private String mediaServerId;
-
- private int current;
-
-
- public MediaSendRtpPortInfo(int start, int end, String mediaServerId) {
- this.start = start;
- this.current = start;
- this.end = end;
- this.mediaServerId = mediaServerId;
- }
-
- public int getStart() {
- return start;
- }
-
- public void setStart(int start) {
- this.start = start;
- }
-
- public int getEnd() {
- return end;
- }
-
- public void setEnd(int end) {
- this.end = end;
- }
-
- public String getMediaServerId() {
- return mediaServerId;
- }
-
- public void setMediaServerId(String mediaServerId) {
- this.mediaServerId = mediaServerId;
- }
-
- public int getCurrent() {
- return current;
- }
-
- public void setCurrent(int current) {
- this.current = current;
- }
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index 74bea6c..7a52363 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -121,34 +121,6 @@
if (ssrcFactory.hasMediaServerSSRC(mediaServerItem.getId())) {
ssrcFactory.initMediaServerSSRC(mediaServerItem.getId(), null);
}
- if (userSetting.getGbSendStreamStrict()) {
- int startPort = 50000;
- int endPort = 60000;
- String sendRtpPortRange = mediaServerItem.getSendRtpPortRange();
- if (sendRtpPortRange == null) {
- logger.warn("[zlm] ] 鏈厤缃彂娴佺鍙ｈ寖鍥达紝榛樿浣跨敤50000鍒�60000");
- }else {
- String[] sendRtpPortRangeArray = sendRtpPortRange.trim().split(",");
- if (sendRtpPortRangeArray.length != 2) {
- logger.warn("[zlm] ] 鍙戞祦绔彛鑼冨洿閿欒锛岄粯璁や娇鐢�50000鍒�60000");
- }else {
- try {
- startPort = Integer.parseInt(sendRtpPortRangeArray[0]);
- endPort = Integer.parseInt(sendRtpPortRangeArray[1]);
- if (endPort <= startPort) {
- logger.warn("[zlm] ] 鍙戞祦绔彛鑼冨洿閿欒锛岀粨鏉熺鍙ｅ簲澶т簬寮�濮嬬鍙�,浣跨敤榛樿绔彛");
- startPort = 50000;
- endPort = 60000;
- }
-
- }catch (NumberFormatException e) {
- logger.warn("[zlm] ] 鍙戞祦绔彛鑼冨洿閿欒锛岄粯璁や娇鐢�50000鍒�60000");
- }
- }
- }
- logger.info("[[zlm] ] 閰嶇疆鍙戞祦绔彛鑼冨洿锛寋}-{}", startPort, endPort);
- sendRtpPortManager.initServerPort(mediaServerItem.getId(), startPort, endPort);
- }
// 鏌ヨredis鏄惁瀛樺湪姝ediaServer
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
Boolean hasKey = redisTemplate.hasKey(key);
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index e248fd1..3b9d617 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -440,7 +440,7 @@
InviteErrorCode.SUCCESS.getCode(),
InviteErrorCode.SUCCESS.getMsg(),
streamInfo);
- logger.info("[鐐规挱鎴愬姛] deviceId: {}, channelId:{}, 鐮佹祦绫诲瀷锛歿}", device.getDeviceId(),
+ logger.info("[鐐规挱鎴愬姛] deviceId: {}, channelId:{}, 鐮佹祦绫诲瀷锛歿}", device.getDeviceId(), channelId,
device.isSwitchPrimarySubStream() ? "杈呯爜娴�" : "涓荤爜娴�");
snapOnPlay(mediaServerItemInuse, device.getDeviceId(), channelId, ssrcInfo.getStream());
}, (event) -> {
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
index fb844c9..0e0bc18 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -155,25 +155,24 @@
return;
}
- String talkKey = UUID.randomUUID().toString();
- dynamicTask.startCron(talkKey, ()->{
- StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(param.getApp(), param.getStream(), mediaInfo.getId(), false);
- if (streamInfo != null) {
- callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
- }
- }, 1000);
- String delayTalkKey = UUID.randomUUID().toString();
- dynamicTask.startDelay(delayTalkKey, ()->{
- StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(param.getApp(), param.getStream(), mediaInfo.getId(), false);
- if (streamInfo != null) {
- callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
- }else {
- dynamicTask.stop(talkKey);
- callback.run(ErrorCode.ERROR100.getCode(), "瓒呮椂", null);
- }
- }, 5000);
-
if (param.isEnable()) {
+ String talkKey = UUID.randomUUID().toString();
+ dynamicTask.startCron(talkKey, ()->{
+ StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(param.getApp(), param.getStream(), mediaInfo.getId(), false);
+ if (streamInfo != null) {
+ callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
+ }
+ }, 1000);
+ String delayTalkKey = UUID.randomUUID().toString();
+ dynamicTask.startDelay(delayTalkKey, ()->{
+ StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(param.getApp(), param.getStream(), mediaInfo.getId(), false);
+ if (streamInfo != null) {
+ callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
+ }else {
+ dynamicTask.stop(talkKey);
+ callback.run(ErrorCode.ERROR100.getCode(), "瓒呮椂", null);
+ }
+ }, 5000);
JSONObject jsonObject = addStreamProxyToZlm(param);
if (jsonObject != null && jsonObject.getInteger("code") == 0) {
dynamicTask.stop(talkKey);
@@ -190,13 +189,16 @@
}
if (jsonObject == null){
callback.run(ErrorCode.ERROR100.getCode(), "璁板綍宸蹭繚瀛橈紝鍚敤澶辫触", null);
- return;
}else {
callback.run(ErrorCode.ERROR100.getCode(), jsonObject.getString("msg"), null);
- return;
}
}
}
+ else{
+ StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(
+ mediaInfo, param.getApp(), param.getStream(), null, null);
+ callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
+ }
}
private String getSchemaFromFFmpegCmd(String ffmpegCmd) {
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
index 8d6e480..f609a8d 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
@@ -139,8 +139,8 @@
redisTemplate.opsForValue().set(receiveKey, otherRtpSendInfo);
if (isSend != null && isSend) {
// 棰勫垱寤哄彂娴佷俊鎭�
- int portForVideo = sendRtpPortManager.getNextPort(mediaServerItem.getId());
- int portForAudio = sendRtpPortManager.getNextPort(mediaServerItem.getId());
+ int portForVideo = sendRtpPortManager.getNextPort(mediaServerItem);
+ int portForAudio = sendRtpPortManager.getNextPort(mediaServerItem);
otherRtpSendInfo.setSendLocalIp(mediaServerItem.getSdpIp());
otherRtpSendInfo.setSendLocalPortForVideo(portForVideo);
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
index bef7ffb..f4bcb1a 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
@@ -8,6 +8,7 @@
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.VersionInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.IHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
@@ -71,6 +72,9 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private SendRtpPortManager sendRtpPortManager;
@GetMapping(value = "/media_server/list")
@@ -262,4 +266,12 @@
return result;
}
+
+ @PostMapping(value = "/test/getPort")
+ @ResponseBody
+ public int getPort() {
+ int result = sendRtpPortManager.getNextPort(mediaServerService.getDefaultMediaServer());
+ System.out.println(result);
+ return result;
+ }
}
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 18fdfa9..39f6388 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
@@ -52,13 +52,13 @@
private IRedisCatchStorage redisCatchStorage;
@Autowired
- private IInviteStreamService inviteStreamService;
-
- @Autowired
private IDeviceService deviceService;
@Autowired
private IPlayService playService;
+
+ @Autowired
+ private IInviteStreamService inviteStreamService;
/**
* 瀹炴椂鐩存挱 - 寮�濮嬬洿鎾�
@@ -92,7 +92,7 @@
result.put("error","device[ " + serial + " ]鏈壘鍒�");
resultDeferredResult.setResult(result);
return resultDeferredResult;
- }else if (!device.isOnLine()) {
+ }else if (device.isOnLine()) {
JSONObject result = new JSONObject();
result.put("error","device[ " + code + " ]offline");
resultDeferredResult.setResult(result);
@@ -133,11 +133,17 @@
result.put("ChannelName", deviceChannel.getName());
result.put("ChannelCustomName", "");
result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl());
+ 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());
result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl());
+ result.put("RTMPS", inviteInfo.getStreamInfo().getRtmps().getUrl());
result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl());
+ result.put("HTTPS_HLS", inviteInfo.getStreamInfo().getHttps_hls().getUrl());
result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl());
+ result.put("RTSPS", inviteInfo.getStreamInfo().getRtsps().getUrl());
result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().getUrl());
+ 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 df148bb..9b94f6f 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -145,8 +145,8 @@
enable: true
# [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, 蹇呴』鎻愬墠鍦▃lm涓婇厤缃灞炴�э紝涓嶇劧鑷姩閰嶇疆姝ゅ睘鎬у彲鑳戒笉鎴愬姛
port-range: 30000,30500 # 绔彛鑼冨洿
- # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦
- send-port-range: 30000,30500 # 绔彛鑼冨洿
+ # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦锛岃涓嶈涓庢敹娴佺鍙ｈ寖鍥撮噸鍚�
+ send-port-range: 50502,50506 # 绔彛鑼冨洿
# 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
record-assist-port: 0
--
Gitblit v1.8.0