From a3649ca243f827f78b85dbb41af2c3d7d978aa89 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 27 四月 2021 15:38:00 +0800
Subject: [PATCH] 优化mysql建库脚本
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 62 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
index 02fb742..430c690 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.media.zlm;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.gb28181.session.SsrcUtil;
@@ -17,32 +18,55 @@
private Logger logger = LoggerFactory.getLogger("ZLMRTPServerFactory");
- @Value("${media.rtp.udpPortRange}")
- private String udpPortRange;
+ @Value("${media.rtp.portRange}")
+ private String portRange;
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
- private int[] udpPortRangeArray = new int[2];
+ private int[] portRangeArray = new int[2];
private int currentPort = 0;
+ private Map<String, Integer> currentStreams = null;
+
public int createRTPServer(String streamId) {
+ if (currentStreams == null) {
+ currentStreams = new HashMap<>();
+ JSONObject jsonObject = zlmresTfulUtils.listRtpServer();
+ JSONArray data = jsonObject.getJSONArray("data");
+ if (data != null) {
+ for (int i = 0; i < data.size(); i++) {
+ JSONObject dataItem = data.getJSONObject(i);
+ currentStreams.put(dataItem.getString("stream_id"), dataItem.getInteger("port"));
+ }
+ }
+ }
+ // 宸茬粡鍦ㄦ帹娴�
+ if (currentStreams.get(streamId) != null) {
+ Map<String, Object> closeRtpServerParam = new HashMap<>();
+ closeRtpServerParam.put("stream_id", streamId);
+ zlmresTfulUtils.closeRtpServer(closeRtpServerParam);
+ currentStreams.remove(streamId);
+ }
+
Map<String, Object> param = new HashMap<>();
int result = -1;
- int newPort = getPortFromUdpPortRange();
+ int newPort = getPortFromportRange();
param.put("port", newPort);
param.put("enable_tcp", 1);
param.put("stream_id", streamId);
JSONObject jsonObject = zlmresTfulUtils.openRtpServer(param);
- System.out.println(jsonObject);
if (jsonObject != null) {
switch (jsonObject.getInteger("code")){
case 0:
result= newPort;
break;
- case -300: // id宸茬粡瀛樺湪
+ case -300: // id宸茬粡瀛樺湪, 鍙兘宸茬粡鍦ㄥ叾浠栫鍙ｆ帹娴�
+ Map<String, Object> closeRtpServerParam = new HashMap<>();
+ closeRtpServerParam.put("stream_id", streamId);
+ zlmresTfulUtils.closeRtpServer(closeRtpServerParam);
result = newPort;
break;
case -400: // 绔彛鍗犵敤
@@ -77,16 +101,16 @@
return result;
}
- private int getPortFromUdpPortRange() {
+ private int getPortFromportRange() {
if (currentPort == 0) {
- String[] udpPortRangeStrArray = udpPortRange.split(",");
- udpPortRangeArray[0] = Integer.parseInt(udpPortRangeStrArray[0]);
- udpPortRangeArray[1] = Integer.parseInt(udpPortRangeStrArray[1]);
+ String[] portRangeStrArray = portRange.split(",");
+ portRangeArray[0] = Integer.parseInt(portRangeStrArray[0]);
+ portRangeArray[1] = Integer.parseInt(portRangeStrArray[1]);
}
- if (currentPort == 0 || currentPort++ > udpPortRangeArray[1]) {
- currentPort = udpPortRangeArray[0];
- return udpPortRangeArray[0];
+ if (currentPort == 0 || currentPort++ > portRangeArray[1]) {
+ currentPort = portRangeArray[0];
+ return portRangeArray[0];
} else {
if (currentPort % 2 == 1) {
currentPort++;
@@ -165,12 +189,12 @@
public Boolean startSendRtpStream(Map<String, Object>param) {
Boolean result = false;
JSONObject jsonObject = zlmresTfulUtils.startSendRtp(param);
- System.out.println(jsonObject);
+ logger.info(jsonObject.toJSONString());
if (jsonObject == null) {
logger.error("RTP鎺ㄦ祦澶辫触: 璇锋鏌LM鏈嶅姟");
} else if (jsonObject.getInteger("code") == 0) {
result= true;
- logger.error("RTP鎺ㄦ祦璇锋眰鎴愬姛锛屾湰鍦版帹娴佺鍙ｏ細" + jsonObject.getString("local_port"));
+ logger.info("RTP鎺ㄦ祦璇锋眰鎴愬姛锛屾湰鍦版帹娴佺鍙ｏ細" + jsonObject.getString("local_port"));
} else {
logger.error("RTP鎺ㄦ祦澶辫触: " + jsonObject.getString("msg"));
}
@@ -209,15 +233,19 @@
public Boolean stopSendRtpStream(Map<String, Object>param) {
Boolean result = false;
JSONObject jsonObject = zlmresTfulUtils.stopSendRtp(param);
- System.out.println(jsonObject);
+ logger.info(jsonObject.toJSONString());
if (jsonObject == null) {
logger.error("鍋滄RTP鎺ㄦ祦澶辫触: 璇锋鏌LM鏈嶅姟");
} else if (jsonObject.getInteger("code") == 0) {
result= true;
- logger.error("鍋滄RTP鎺ㄦ祦鎴愬姛");
+ logger.info("鍋滄RTP鎺ㄦ祦鎴愬姛");
} else {
logger.error("鍋滄RTP鎺ㄦ祦澶辫触: " + jsonObject.getString("msg"));
}
return result;
}
+
+ public void closeAllSendRtpStream() {
+
+ }
}
--
Gitblit v1.8.0