From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:18:49 +0800
Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 350 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 270 insertions(+), 80 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 a25753e..24e0dcf 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,102 +1,196 @@
package com.genersoft.iot.vmp.media.zlm;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
-import com.genersoft.iot.vmp.gb28181.session.SsrcUtil;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
@Component
public class ZLMRTPServerFactory {
private Logger logger = LoggerFactory.getLogger("ZLMRTPServerFactory");
- @Value("${media.rtp.udpPortRange}")
- private String udpPortRange;
-
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
- private int[] udpPortRangeArray = new int[2];
+ @Autowired
+ private UserSetting userSetting;
- private int currentPort = 0;
+ private int[] portRangeArray = new int[2];
- public int createRTPServer(String streamId) {
+ public int getFreePort(MediaServerItem mediaServerItem, int startPort, int endPort, List<Integer> usedFreelist) {
+ if (endPort <= startPort) {
+ return -1;
+ }
+ if (usedFreelist == null) {
+ usedFreelist = new ArrayList<>();
+ }
+ JSONObject listRtpServerJsonResult = zlmresTfulUtils.listRtpServer(mediaServerItem);
+ if (listRtpServerJsonResult != null) {
+ JSONArray data = listRtpServerJsonResult.getJSONArray("data");
+ if (data != null) {
+ for (int i = 0; i < data.size(); i++) {
+ JSONObject dataItem = data.getJSONObject(i);
+ usedFreelist.add(dataItem.getInteger("port"));
+ }
+ }
+ }
+
Map<String, Object> param = new HashMap<>();
int result = -1;
- int newPort = getPortFromUdpPortRange();
- param.put("port", newPort);
+ // 璁剧疆鎺ㄦ祦绔彛
+ if (startPort%2 == 1) {
+ startPort ++;
+ }
+ boolean checkPort = false;
+ for (int i = startPort; i < endPort + 1; i+=2) {
+ if (!usedFreelist.contains(i)){
+ checkPort = true;
+ startPort = i;
+ break;
+ }
+ }
+ if (!checkPort) {
+ logger.warn("鏈壘鍒拌妭鐐箋}涓婅寖鍥碵{}-{}]鐨勭┖闂茬鍙�", mediaServerItem.getId(), startPort, endPort);
+ return -1;
+ }
+ param.put("port", startPort);
+ String stream = UUID.randomUUID().toString();
+ param.put("enable_tcp", 1);
+ param.put("stream_id", stream);
+// param.put("port", 0);
+ JSONObject openRtpServerResultJson = zlmresTfulUtils.openRtpServer(mediaServerItem, param);
+
+ if (openRtpServerResultJson != null) {
+ if (openRtpServerResultJson.getInteger("code") == 0) {
+ result= openRtpServerResultJson.getInteger("port");
+ Map<String, Object> closeRtpServerParam = new HashMap<>();
+ closeRtpServerParam.put("stream_id", stream);
+ zlmresTfulUtils.closeRtpServer(mediaServerItem, closeRtpServerParam);
+ }else {
+ usedFreelist.add(startPort);
+ startPort +=2;
+ result = getFreePort(mediaServerItem, startPort, endPort,usedFreelist);
+ }
+ }else {
+ // 妫�鏌LM鐘舵��
+ logger.error("鍒涘缓RTP Server 澶辫触 {}: 璇锋鏌LM鏈嶅姟", param.get("port"));
+ }
+ return result;
+ }
+
+ public int createRTPServer(MediaServerItem mediaServerItem, String streamId, int ssrc, Integer port) {
+ int result = -1;
+ // 鏌ヨ姝tp server 鏄惁宸茬粡瀛樺湪
+ JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaServerItem, streamId);
+ logger.info(JSONObject.toJSONString(rtpInfo));
+ if(rtpInfo.getInteger("code") == 0){
+ if (rtpInfo.getBoolean("exist")) {
+ result = rtpInfo.getInteger("local_port");
+ if (result == 0) {
+ // 姝ゆ椂璇存槑rtpServer宸茬粡鍒涘缓浣嗘槸娴佽繕娌℃湁鎺ㄤ笂鏉�
+ // 姝ゆ椂閲嶆柊鎵撳紑rtpServer
+ Map<String, Object> param = new HashMap<>();
+ param.put("stream_id", streamId);
+ JSONObject jsonObject = zlmresTfulUtils.closeRtpServer(mediaServerItem, param);
+ if (jsonObject != null ) {
+ if (jsonObject.getInteger("code") == 0) {
+ return createRTPServer(mediaServerItem, streamId, ssrc, port);
+ }else {
+ logger.warn("[寮�鍚痳tpServer], 閲嶅惎RtpServer閿欒");
+ }
+ }
+ }
+ return result;
+ }
+ }else if(rtpInfo.getInteger("code") == -2){
+ return result;
+ }
+
+ Map<String, Object> param = new HashMap<>();
+
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宸茬粡瀛樺湪
- result = newPort;
- break;
- case -400: // 绔彛鍗犵敤
- result= createRTPServer(streamId);
- break;
- default:
- logger.error("鍒涘缓RTP Server 澶辫触: " + jsonObject.getString("msg"));
- break;
- }
+ // 鎺ㄦ祦绔彛璁剧疆0鍒欎娇鐢ㄩ殢鏈虹鍙�
+ if (port == null) {
+ param.put("port", 0);
}else {
- // 妫�鏌LM鐘舵��
- logger.error("鍒涘缓RTP Server 澶辫触: 璇锋鏌LM鏈嶅姟");
+ param.put("port", port);
}
- return result;
- }
-
- public boolean closeRTPServer(String streamId) {
- boolean result = false;
- Map<String, Object> param = new HashMap<>();
- param.put("stream_id", streamId);
- JSONObject jsonObject = zlmresTfulUtils.closeRtpServer(param);
- if (jsonObject != null ) {
- if (jsonObject.getInteger("code") == 0) {
- result = jsonObject.getInteger("hit") == 1;
+ param.put("ssrc", ssrc);
+ JSONObject openRtpServerResultJson = zlmresTfulUtils.openRtpServer(mediaServerItem, param);
+ logger.info(JSONObject.toJSONString(openRtpServerResultJson));
+ if (openRtpServerResultJson != null) {
+ if (openRtpServerResultJson.getInteger("code") == 0) {
+ result= openRtpServerResultJson.getInteger("port");
}else {
- logger.error("鍏抽棴RTP Server 澶辫触: " + jsonObject.getString("msg"));
+ logger.error("鍒涘缓RTP Server 澶辫触 {}: ", openRtpServerResultJson.getString("msg"));
}
}else {
// 妫�鏌LM鐘舵��
- logger.error("鍏抽棴RTP Server 澶辫触: 璇锋鏌LM鏈嶅姟");
+ logger.error("鍒涘缓RTP Server 澶辫触 {}: 璇锋鏌LM鏈嶅姟", param.get("port"));
}
return result;
}
- private int getPortFromUdpPortRange() {
- if (currentPort == 0) {
- String[] udpPortRangeStrArray = udpPortRange.split(",");
- udpPortRangeArray[0] = Integer.parseInt(udpPortRangeStrArray[0]);
- udpPortRangeArray[1] = Integer.parseInt(udpPortRangeStrArray[1]);
- }
-
- if (currentPort == 0 || currentPort++ > udpPortRangeArray[1]) {
- currentPort = udpPortRangeArray[0];
- return udpPortRangeArray[0];
- } else {
- if (currentPort % 2 == 1) {
- currentPort++;
+ public boolean closeRTPServer(MediaServerItem serverItem, String streamId) {
+ boolean result = false;
+ if (serverItem !=null){
+ Map<String, Object> param = new HashMap<>();
+ param.put("stream_id", streamId);
+ JSONObject jsonObject = zlmresTfulUtils.closeRtpServer(serverItem, param);
+ if (jsonObject != null ) {
+ if (jsonObject.getInteger("code") == 0) {
+ result = jsonObject.getInteger("hit") == 1;
+ }else {
+ logger.error("鍏抽棴RTP Server 澶辫触: " + jsonObject.getString("msg"));
+ }
+ }else {
+ // 妫�鏌LM鐘舵��
+ logger.error("鍏抽棴RTP Server 澶辫触: 璇锋鏌LM鏈嶅姟");
}
- return currentPort++;
}
+ return result;
}
+
+// private int getPortFromportRange(MediaServerItem mediaServerItem) {
+// int currentPort = mediaServerItem.getCurrentPort();
+// if (currentPort == 0) {
+// String[] portRangeStrArray = mediaServerItem.getSendRtpPortRange().split(",");
+// if (portRangeStrArray.length != 2) {
+// portRangeArray[0] = 30000;
+// portRangeArray[1] = 30500;
+// }else {
+// portRangeArray[0] = Integer.parseInt(portRangeStrArray[0]);
+// portRangeArray[1] = Integer.parseInt(portRangeStrArray[1]);
+// }
+// }
+//
+// if (currentPort == 0 || currentPort++ > portRangeArray[1]) {
+// currentPort = portRangeArray[0];
+// mediaServerItem.setCurrentPort(currentPort);
+// return portRangeArray[0];
+// } else {
+// if (currentPort % 2 == 1) {
+// currentPort++;
+// }
+// currentPort++;
+// mediaServerItem.setCurrentPort(currentPort);
+// return currentPort;
+// }
+// }
/**
- * 鍒涘缓涓�涓帹娴�
+ * 鍒涘缓涓�涓浗鏍囨帹娴�
* @param ip 鎺ㄦ祦ip
* @param port 鎺ㄦ祦绔彛
* @param ssrc 鎺ㄦ祦鍞竴鏍囪瘑
@@ -105,12 +199,21 @@
* @param tcp 鏄惁涓簍cp
* @return SendRtpItem
*/
- public SendRtpItem createSendRtpItem(String ip, int port, String ssrc, String platformId, String deviceId, String channelId, boolean tcp){
- String playSsrc = SsrcUtil.getPlaySsrc();
- int localPort = createRTPServer(SsrcUtil.getPlaySsrc());
- if (localPort != -1) {
- closeRTPServer(playSsrc);
+ public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId, String deviceId, String channelId, boolean tcp){
+
+ // 浣跨敤RTPServer 鍔熻兘鎵句竴涓彲鐢ㄧ殑绔彛
+ String sendRtpPortRange = serverItem.getSendRtpPortRange();
+ if (ObjectUtils.isEmpty(sendRtpPortRange)) {
+ return null;
+ }
+ String[] portRangeStrArray = serverItem.getSendRtpPortRange().split(",");
+ int localPort = -1;
+ if (portRangeStrArray.length != 2) {
+ localPort = getFreePort(serverItem, 30000, 30500, null);
}else {
+ localPort = getFreePort(serverItem, Integer.parseInt(portRangeStrArray[0]), Integer.parseInt(portRangeStrArray[1]), null);
+ }
+ if (localPort == -1) {
logger.error("娌℃湁鍙敤鐨勭鍙�");
return null;
}
@@ -122,33 +225,120 @@
sendRtpItem.setDeviceId(deviceId);
sendRtpItem.setChannelId(channelId);
sendRtpItem.setTcp(tcp);
+ sendRtpItem.setApp("rtp");
sendRtpItem.setLocalPort(localPort);
+ sendRtpItem.setServerId(userSetting.getServerId());
+ sendRtpItem.setMediaServerId(serverItem.getId());
return sendRtpItem;
}
/**
- * 璋冪敤zlm RESTful API 鈥斺�� startSendRtp
+ * 鍒涘缓涓�涓洿鎾帹娴�
+ * @param ip 鎺ㄦ祦ip
+ * @param port 鎺ㄦ祦绔彛
+ * @param ssrc 鎺ㄦ祦鍞竴鏍囪瘑
+ * @param platformId 骞冲彴id
+ * @param channelId 閫氶亾id
+ * @param tcp 鏄惁涓簍cp
+ * @return SendRtpItem
*/
- public Boolean startSendRtpStream(Map<String, Object>param) {
- Boolean result = false;
- JSONObject jsonObject = zlmresTfulUtils.startSendRtp(param);
- System.out.println(jsonObject);
- if (jsonObject == null) {
- logger.error("RTP鎺ㄦ祦澶辫触: 璇锋鏌LM鏈嶅姟");
- } else if (jsonObject.getInteger("code") == 0) {
- result= true;
- logger.error("RTP鎺ㄦ祦璇锋眰鎴愬姛锛屾湰鍦版帹娴佺鍙ｏ細" + jsonObject.getString("local_port"));
- } else {
- logger.error("RTP鎺ㄦ祦澶辫触: " + jsonObject.getString("msg"));
+ public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId, String app, String stream, String channelId, boolean tcp){
+ // 浣跨敤RTPServer 鍔熻兘鎵句竴涓彲鐢ㄧ殑绔彛
+ String sendRtpPortRange = serverItem.getSendRtpPortRange();
+ if (ObjectUtils.isEmpty(sendRtpPortRange)) {
+ return null;
}
- return result;
+ String[] portRangeStrArray = serverItem.getSendRtpPortRange().split(",");
+ int localPort = -1;
+ if (portRangeStrArray.length != 2) {
+ localPort = getFreePort(serverItem, 30000, 30500, null);
+ }else {
+ localPort = getFreePort(serverItem, Integer.parseInt(portRangeStrArray[0]), Integer.parseInt(portRangeStrArray[1]), null);
+ }
+ if (localPort == -1) {
+ logger.error("娌℃湁鍙敤鐨勭鍙�");
+ return null;
+ }
+ SendRtpItem sendRtpItem = new SendRtpItem();
+ sendRtpItem.setIp(ip);
+ sendRtpItem.setPort(port);
+ sendRtpItem.setSsrc(ssrc);
+ sendRtpItem.setApp(app);
+ sendRtpItem.setStreamId(stream);
+ sendRtpItem.setPlatformId(platformId);
+ sendRtpItem.setChannelId(channelId);
+ sendRtpItem.setTcp(tcp);
+ sendRtpItem.setLocalPort(localPort);
+ sendRtpItem.setServerId(userSetting.getServerId());
+ sendRtpItem.setMediaServerId(serverItem.getId());
+ return sendRtpItem;
+ }
+
+ /**
+ * 璋冪敤zlm RESTFUL API 鈥斺�� startSendRtp
+ */
+ public JSONObject startSendRtpStream(MediaServerItem mediaServerItem, Map<String, Object>param) {
+ return zlmresTfulUtils.startSendRtp(mediaServerItem, param);
}
/**
* 鏌ヨ寰呰浆鎺ㄧ殑娴佹槸鍚﹀氨缁�
*/
- public Boolean isRtpReady(String streamId) {
- JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId);
+ public Boolean isRtpReady(MediaServerItem mediaServerItem, String streamId) {
+ JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem,"rtp", "rtsp", streamId);
return (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online"));
}
+
+ /**
+ * 鏌ヨ寰呰浆鎺ㄧ殑娴佹槸鍚﹀氨缁�
+ */
+ public Boolean isStreamReady(MediaServerItem mediaServerItem, String app, String streamId) {
+ JSONObject mediaInfo = zlmresTfulUtils.getMediaList(mediaServerItem, app, streamId);
+ return (mediaInfo.getInteger("code") == 0
+ && mediaInfo.getJSONArray("data") != null
+ && mediaInfo.getJSONArray("data").size() > 0);
+ }
+
+ /**
+ * 鏌ヨ杞帹鐨勬祦鏄惁鏈夊叾瀹冭鐪嬭��
+ * @param streamId
+ * @return
+ */
+ public int totalReaderCount(MediaServerItem mediaServerItem, String app, String streamId) {
+ JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem, app, "rtsp", streamId);
+ if (mediaInfo == null) {
+ return 0;
+ }
+ Integer code = mediaInfo.getInteger("code");
+ if ( code < 0) {
+ logger.warn("鏌ヨ娴�({}/{})鏄惁鏈夊叾瀹冭鐪嬭�呮椂寰楀埌锛� {}", app, streamId, mediaInfo.getString("msg"));
+ return -1;
+ }
+ if ( code == 0 && mediaInfo.getBoolean("online") != null && !mediaInfo.getBoolean("online")) {
+ logger.warn("鏌ヨ娴�({}/{})鏄惁鏈夊叾瀹冭鐪嬭�呮椂寰楀埌锛� {}", app, streamId, mediaInfo.getString("msg"));
+ return -1;
+ }
+ return mediaInfo.getInteger("totalReaderCount");
+ }
+
+ /**
+ * 璋冪敤zlm RESTful API 鈥斺�� stopSendRtp
+ */
+ public Boolean stopSendRtpStream(MediaServerItem mediaServerItem, Map<String, Object>param) {
+ Boolean result = false;
+ JSONObject jsonObject = zlmresTfulUtils.stopSendRtp(mediaServerItem, param);
+ if (jsonObject == null) {
+ logger.error("[鍋滄RTP鎺ㄦ祦] 澶辫触: 璇锋鏌LM鏈嶅姟");
+ } else if (jsonObject.getInteger("code") == 0) {
+ result= true;
+ logger.info("[鍋滄RTP鎺ㄦ祦] 鎴愬姛");
+ } else {
+ logger.error("[鍋滄RTP鎺ㄦ祦] 澶辫触: {}, 鍙傛暟锛歿}->\r\n{}",jsonObject.getString("msg"),JSONObject.toJSON(param), jsonObject);
+ }
+ return result;
+ }
+
+ public void closeAllSendRtpStream() {
+
+ }
}
--
Gitblit v1.8.0