From d48f89eee40c58b2f0b69aaf4d7fab469dc4657b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 24 七月 2023 09:04:47 +0800
Subject: [PATCH] 修复端口分配的并发问题
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 38 +++++---------------------------------
1 files changed, 5 insertions(+), 33 deletions(-)
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 9d4a9dc..142b810 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
@@ -87,7 +87,7 @@
@Autowired
- private ZLMServerFactory ZLMServerFactory;
+ private ZLMServerFactory zlmServerFactory;
@Autowired
private EventPublisher publisher;
@@ -118,34 +118,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();
@@ -181,7 +153,7 @@
}
int rtpServerPort;
if (mediaServerItem.isRtpEnable()) {
- rtpServerPort = ZLMServerFactory.createRTPServer(mediaServerItem, streamId, ssrcCheck?Integer.parseInt(ssrc):0, port, reUsePort, tcpMode);
+ rtpServerPort = zlmServerFactory.createRTPServer(mediaServerItem, streamId, ssrcCheck?Integer.parseInt(ssrc):0, port, reUsePort, tcpMode);
} else {
rtpServerPort = mediaServerItem.getRtpProxyPort();
}
@@ -193,7 +165,7 @@
if (mediaServerItem == null) {
return;
}
- ZLMServerFactory.closeRtpServer(mediaServerItem, streamId);
+ zlmServerFactory.closeRtpServer(mediaServerItem, streamId);
}
@Override
@@ -202,7 +174,7 @@
callback.run(false);
return;
}
- ZLMServerFactory.closeRtpServer(mediaServerItem, streamId, callback);
+ zlmServerFactory.closeRtpServer(mediaServerItem, streamId, callback);
}
@Override
@@ -213,7 +185,7 @@
@Override
public Boolean updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc) {
- return ZLMServerFactory.updateRtpServerSSRC(mediaServerItem, streamId, ssrc);
+ return zlmServerFactory.updateRtpServerSSRC(mediaServerItem, streamId, ssrc);
}
@Override
--
Gitblit v1.8.0