From d340a37a00c8d5ea2605ca0f40a920efbeb9546f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 十一月 2022 11:31:30 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 279 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 171 insertions(+), 108 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 76bab9c..dd054f8 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,17 +1,17 @@
package com.genersoft.iot.vmp.media.zlm;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
@Component
public class ZLMRTPServerFactory {
@@ -21,60 +21,67 @@
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
+ @Autowired
+ private UserSetting userSetting;
+
+ @Autowired
+ private ZlmHttpHookSubscribe hookSubscribe;
+
private int[] portRangeArray = new int[2];
- public int createRTPServer(MediaServerItem mediaServerItem, String streamId) {
- Map<String, Integer> currentStreams = new HashMap<>();
+ 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);
- currentStreams.put(dataItem.getString("stream_id"), dataItem.getInteger("port"));
+ usedFreelist.add(dataItem.getInteger("port"));
}
}
- }
- // 宸茬粡鍦ㄦ帹娴�
- if (currentStreams.get(streamId) != null) {
- Map<String, Object> closeRtpServerParam = new HashMap<>();
- closeRtpServerParam.put("stream_id", streamId);
- zlmresTfulUtils.closeRtpServer(mediaServerItem, closeRtpServerParam);
- currentStreams.remove(streamId);
}
Map<String, Object> param = new HashMap<>();
int result = -1;
- /**
- * 涓嶈缃帹娴佺鍙ｇ鍒欎娇鐢ㄩ殢鏈虹鍙�
- */
- if (StringUtils.isEmpty(mediaServerItem.getSendRtpPortRange())){
- param.put("port", 0);
- }else {
- int newPort = getPortFromportRange(mediaServerItem);
- 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", streamId);
+ param.put("stream_id", stream);
+// param.put("port", 0);
JSONObject openRtpServerResultJson = zlmresTfulUtils.openRtpServer(mediaServerItem, param);
if (openRtpServerResultJson != null) {
- switch (openRtpServerResultJson.getInteger("code")){
- case 0:
- result= openRtpServerResultJson.getInteger("port");
- break;
- case -300: // id宸茬粡瀛樺湪, 鍙兘宸茬粡鍦ㄥ叾浠栫鍙ｆ帹娴�
- Map<String, Object> closeRtpServerParam = new HashMap<>();
- closeRtpServerParam.put("stream_id", streamId);
- zlmresTfulUtils.closeRtpServer(mediaServerItem, closeRtpServerParam);
- result = createRTPServer(mediaServerItem, streamId);;
- break;
- case -400: // 绔彛鍗犵敤
- result= createRTPServer(mediaServerItem, streamId);
- break;
- default:
- logger.error("鍒涘缓RTP Server 澶辫触 {}: " + openRtpServerResultJson.getString("msg"), param.get("port"));
- break;
+ 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鐘舵��
@@ -83,7 +90,61 @@
return result;
}
- public boolean closeRTPServer(MediaServerItem serverItem, String streamId) {
+ 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);
+ // 鎺ㄦ祦绔彛璁剧疆0鍒欎娇鐢ㄩ殢鏈虹鍙�
+ if (port == null) {
+ param.put("port", 0);
+ }else {
+ param.put("port", port);
+ }
+ 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 澶辫触 {}: ", openRtpServerResultJson.getString("msg"));
+ }
+ }else {
+ // 妫�鏌LM鐘舵��
+ logger.error("鍒涘缓RTP Server 澶辫触 {}: 璇锋鏌LM鏈嶅姟", param.get("port"));
+ }
+ return result;
+ }
+
+ public boolean closeRtpServer(MediaServerItem serverItem, String streamId) {
boolean result = false;
if (serverItem !=null){
Map<String, Object> param = new HashMap<>();
@@ -103,32 +164,6 @@
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;
- }
- }
/**
* 鍒涘缓涓�涓浗鏍囨帹娴�
@@ -142,16 +177,15 @@
*/
public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId, String deviceId, String channelId, boolean tcp){
- // 浣跨敤RTPServer 鍔熻兘鎵句竴涓彲鐢ㄧ殑绔彛
- String playSsrc = serverItem.getSsrcConfig().getPlaySsrc();
- int localPort = createRTPServer(serverItem, playSsrc);
- if (localPort != -1) {
- // TODO 楂樺苟鍙戞椂鍙兘鍥犱负鏈斁鍏ョ紦瀛樿�宻src鍐茬獊
- serverItem.getSsrcConfig().releaseSsrc(playSsrc);
- closeRTPServer(serverItem, playSsrc);
- }else {
- logger.error("娌℃湁鍙敤鐨勭鍙�");
- return null;
+ // 榛樿涓洪殢鏈虹鍙�
+ int localPort = 0;
+ if (userSetting.getGbSendStreamStrict()) {
+ if (userSetting.getGbSendStreamStrict()) {
+ localPort = keepPort(serverItem, ssrc);
+ if (localPort == 0) {
+ return null;
+ }
+ }
}
SendRtpItem sendRtpItem = new SendRtpItem();
sendRtpItem.setIp(ip);
@@ -163,6 +197,7 @@
sendRtpItem.setTcp(tcp);
sendRtpItem.setApp("rtp");
sendRtpItem.setLocalPort(localPort);
+ sendRtpItem.setServerId(userSetting.getServerId());
sendRtpItem.setMediaServerId(serverItem.getId());
return sendRtpItem;
}
@@ -178,15 +213,13 @@
* @return SendRtpItem
*/
public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId, String app, String stream, String channelId, boolean tcp){
- String playSsrc = serverItem.getSsrcConfig().getPlaySsrc();
- int localPort = createRTPServer(serverItem, playSsrc);
- if (localPort != -1) {
- // TODO 楂樺苟鍙戞椂鍙兘鍥犱负鏈斁鍏ョ紦瀛樿�宻src鍐茬獊
- serverItem.getSsrcConfig().releaseSsrc(ssrc);
- closeRTPServer(serverItem, playSsrc);
- }else {
- logger.error("娌℃湁鍙敤鐨勭鍙�");
- return null;
+ // 榛樿涓洪殢鏈虹鍙�
+ int localPort = 0;
+ if (userSetting.getGbSendStreamStrict()) {
+ localPort = keepPort(serverItem, ssrc);
+ if (localPort == 0) {
+ return null;
+ }
}
SendRtpItem sendRtpItem = new SendRtpItem();
sendRtpItem.setIp(ip);
@@ -198,32 +231,59 @@
sendRtpItem.setChannelId(channelId);
sendRtpItem.setTcp(tcp);
sendRtpItem.setLocalPort(localPort);
+ sendRtpItem.setServerId(userSetting.getServerId());
sendRtpItem.setMediaServerId(serverItem.getId());
return sendRtpItem;
}
/**
- * 璋冪敤zlm RESTful API 鈥斺�� startSendRtp
+ * 淇濇寔绔彛锛岀洿鍒伴渶瑕侀渶瑕佸彂娴佹椂鍐嶉噴鏀�
*/
- public Boolean startSendRtpStream(MediaServerItem mediaServerItem, Map<String, Object>param) {
- Boolean result = false;
- JSONObject jsonObject = zlmresTfulUtils.startSendRtp(mediaServerItem, param);
- if (jsonObject == null) {
- logger.error("RTP鎺ㄦ祦澶辫触: 璇锋鏌LM鏈嶅姟");
- } else if (jsonObject.getInteger("code") == 0) {
- result= true;
- logger.info("RTP鎺ㄦ祦[ {}/{} ]璇锋眰鎴愬姛锛屾湰鍦版帹娴佺鍙ｏ細{}" ,param.get("app"), param.get("stream"), jsonObject.getString("local_port"));
- } else {
- logger.error("RTP鎺ㄦ祦澶辫触: " + jsonObject.getString("msg"));
+ public int keepPort(MediaServerItem serverItem, String ssrc) {
+ int localPort = 0;
+ Map<String, Object> param = new HashMap<>(3);
+ param.put("port", 0);
+ param.put("enable_tcp", 1);
+ param.put("stream_id", ssrc);
+ JSONObject jsonObject = zlmresTfulUtils.openRtpServer(serverItem, param);
+ if (jsonObject.getInteger("code") == 0) {
+ localPort = jsonObject.getInteger("port");
+ HookSubscribeForRtpServerTimeout hookSubscribeForRtpServerTimeout = HookSubscribeFactory.on_rtp_server_timeout(ssrc, null, serverItem.getId());
+ // 璁㈤槄 zlm鍚姩浜嬩欢, 鏂扮殑zlm涔熶細浠庤繖閲岃繘鍏ョ郴缁�
+ hookSubscribe.addSubscribe(hookSubscribeForRtpServerTimeout,
+ (MediaServerItem mediaServerItem, JSONObject response)->{
+ logger.info("[涓婄骇鐐规挱] {}->鐩戝惉绔彛鍒版湡缁х画淇濇寔鐩戝惉", ssrc);
+ keepPort(serverItem, ssrc);
+ });
}
- return result;
+ logger.info("[涓婄骇鐐规挱] {}->鐩戝惉绔彛: {}", ssrc, localPort);
+ return localPort;
+ }
+
+ /**
+ * 閲婃斁淇濇寔鐨勭鍙�
+ */
+ public boolean releasePort(MediaServerItem serverItem, String ssrc) {
+ logger.info("[涓婄骇鐐规挱] {}->閲婃斁鐩戝惉绔彛", ssrc);
+ boolean closeRTPServerResult = closeRtpServer(serverItem, ssrc);
+ HookSubscribeForRtpServerTimeout hookSubscribeForRtpServerTimeout = HookSubscribeFactory.on_rtp_server_timeout(ssrc, null, serverItem.getId());
+ // 璁㈤槄 zlm鍚姩浜嬩欢, 鏂扮殑zlm涔熶細浠庤繖閲岃繘鍏ョ郴缁�
+ hookSubscribe.removeSubscribe(hookSubscribeForRtpServerTimeout);
+ return closeRTPServerResult;
+ }
+
+ /**
+ * 璋冪敤zlm RESTFUL API 鈥斺�� startSendRtp
+ */
+ public JSONObject startSendRtpStream(MediaServerItem mediaServerItem, Map<String, Object>param) {
+ return zlmresTfulUtils.startSendRtp(mediaServerItem, param);
}
/**
* 鏌ヨ寰呰浆鎺ㄧ殑娴佹槸鍚﹀氨缁�
*/
public Boolean isRtpReady(MediaServerItem mediaServerItem, String streamId) {
- JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem,"rtp", "rtmp", streamId);
+ JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem,"rtp", "rtsp", streamId);
return (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online"));
}
@@ -231,8 +291,11 @@
* 鏌ヨ寰呰浆鎺ㄧ殑娴佹槸鍚﹀氨缁�
*/
public Boolean isStreamReady(MediaServerItem mediaServerItem, String app, String streamId) {
- JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem, app, "rtmp", streamId);
- return (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online"));
+ JSONObject mediaInfo = zlmresTfulUtils.getMediaList(mediaServerItem, app, streamId);
+ return mediaInfo != null && (mediaInfo.getInteger("code") == 0
+
+ && mediaInfo.getJSONArray("data") != null
+ && mediaInfo.getJSONArray("data").size() > 0);
}
/**
@@ -241,16 +304,16 @@
* @return
*/
public int totalReaderCount(MediaServerItem mediaServerItem, String app, String streamId) {
- JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem, app, "rtmp", streamId);
- Integer code = mediaInfo.getInteger("code");
+ 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")) {
+ if ( code == 0 && mediaInfo.getBoolean("online") != null && !mediaInfo.getBoolean("online")) {
logger.warn("鏌ヨ娴�({}/{})鏄惁鏈夊叾瀹冭鐪嬭�呮椂寰楀埌锛� {}", app, streamId, mediaInfo.getString("msg"));
return -1;
}
@@ -264,12 +327,12 @@
Boolean result = false;
JSONObject jsonObject = zlmresTfulUtils.stopSendRtp(mediaServerItem, param);
if (jsonObject == null) {
- logger.error("鍋滄RTP鎺ㄦ祦澶辫触: 璇锋鏌LM鏈嶅姟");
+ logger.error("[鍋滄RTP鎺ㄦ祦] 澶辫触: 璇锋鏌LM鏈嶅姟");
} else if (jsonObject.getInteger("code") == 0) {
result= true;
- logger.info("鍋滄RTP鎺ㄦ祦鎴愬姛");
+ logger.info("[鍋滄RTP鎺ㄦ祦] 鎴愬姛");
} else {
- logger.error("鍋滄RTP鎺ㄦ祦澶辫触: " + jsonObject.getString("msg"));
+ logger.error("[鍋滄RTP鎺ㄦ祦] 澶辫触: {}, 鍙傛暟锛歿}->\r\n{}",jsonObject.getString("msg"), JSON.toJSON(param), jsonObject);
}
return result;
}
--
Gitblit v1.8.0