From bac19f583c60f86fd15a13230ea70bfc3a6645b1 Mon Sep 17 00:00:00 2001
From: chenghong <24211317@qq.com>
Date: 星期一, 14 八月 2023 11:44:41 +0800
Subject: [PATCH] 解决两个国标平台相互级联时，上级不能获取目录的问题
---
src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java
index 3ea265f..81ccb57 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java
@@ -17,7 +17,6 @@
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.OtherPsSendInfo;
-import com.genersoft.iot.vmp.vmanager.bean.OtherRtpSendInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -202,9 +201,9 @@
callId);
MediaServerItem mediaServerItem = mediaServerService.getDefaultMediaServer();
String key = VideoManagerConstants.WVP_OTHER_SEND_PS_INFO + userSetting.getServerId() + "_" + callId;
- OtherRtpSendInfo sendInfo = (OtherRtpSendInfo)redisTemplate.opsForValue().get(key);
+ OtherPsSendInfo sendInfo = (OtherPsSendInfo)redisTemplate.opsForValue().get(key);
if (sendInfo == null) {
- sendInfo = new OtherRtpSendInfo();
+ sendInfo = new OtherPsSendInfo();
}
sendInfo.setPushApp(app);
sendInfo.setPushStream(stream);
@@ -223,7 +222,7 @@
param.put("dst_port", dstPort);
String is_Udp = isUdp ? "1" : "0";
param.put("is_udp", is_Udp);
- param.put("src_port", sendInfo.getSendLocalPortForAudio());
+ param.put("src_port", sendInfo.getSendLocalPort());
param.put("use_ps", "0");
param.put("only_audio", "1");
@@ -250,7 +249,7 @@
}, 10000);
// 璁㈤槄 zlm鍚姩浜嬩欢, 鏂扮殑zlm涔熶細浠庤繖閲岃繘鍏ョ郴缁�
- OtherRtpSendInfo finalSendInfo = sendInfo;
+ OtherPsSendInfo finalSendInfo = sendInfo;
hookSubscribe.removeSubscribe(hookSubscribeForStreamChange);
hookSubscribe.addSubscribe(hookSubscribeForStreamChange,
(mediaServerItemInUse, response)->{
@@ -282,7 +281,7 @@
public void closeSendRTP(String callId) {
logger.info("[绗笁鏂筆S鏈嶅姟瀵规帴->鍏抽棴鍙戦�佹祦] callId->{}", callId);
String key = VideoManagerConstants.WVP_OTHER_SEND_PS_INFO + userSetting.getServerId() + "_" + callId;
- OtherRtpSendInfo sendInfo = (OtherRtpSendInfo)redisTemplate.opsForValue().get(key);
+ OtherPsSendInfo sendInfo = (OtherPsSendInfo)redisTemplate.opsForValue().get(key);
if (sendInfo == null){
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈紑鍚彂娴�");
}
@@ -302,4 +301,24 @@
redisTemplate.delete(key);
}
+
+ @GetMapping(value = "/getTestPort")
+ @ResponseBody
+ public int getTestPort() {
+ MediaServerItem defaultMediaServer = mediaServerService.getDefaultMediaServer();
+
+// for (int i = 0; i <300; i++) {
+// new Thread(() -> {
+// int nextPort = sendRtpPortManager.getNextPort(defaultMediaServer);
+// try {
+// Thread.sleep((int)Math.random()*10);
+// } catch (InterruptedException e) {
+// throw new RuntimeException(e);
+// }
+// System.out.println(nextPort);
+// }).start();
+// }
+
+ return sendRtpPortManager.getNextPort(defaultMediaServer);
+ }
}
--
Gitblit v1.8.0