From ec95a429859e2819772231e70dcd80cb976c81d2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 10 二月 2023 15:54:42 +0800
Subject: [PATCH] Merge branch 'main' into main2
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 183 +++++++++++++++++++++++++++++----------------
1 files changed, 119 insertions(+), 64 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 9819343..c7d9966 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,15 +1,17 @@
package com.genersoft.iot.vmp.media.zlm;
+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.HookSubscribeFactory;
+import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForRtpServerTimeout;
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.stereotype.Component;
-import org.springframework.util.ObjectUtils;
import java.util.*;
@@ -23,6 +25,9 @@
@Autowired
private UserSetting userSetting;
+
+ @Autowired
+ private ZlmHttpHookSubscribe hookSubscribe;
private int[] portRangeArray = new int[2];
@@ -141,7 +146,7 @@
return result;
}
- public boolean closeRTPServer(MediaServerItem serverItem, String streamId) {
+ public boolean closeRtpServer(MediaServerItem serverItem, String streamId) {
boolean result = false;
if (serverItem !=null){
Map<String, Object> param = new HashMap<>();
@@ -161,32 +166,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;
-// }
-// }
/**
* 鍒涘缓涓�涓浗鏍囨帹娴�
@@ -198,23 +177,17 @@
* @param tcp 鏄惁涓簍cp
* @return SendRtpItem
*/
- public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId, String deviceId, String channelId, boolean tcp){
+ public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId, String deviceId, String channelId, boolean tcp, boolean rtcp){
- // 浣跨敤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;
+ // 榛樿涓洪殢鏈虹鍙�
+ 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);
@@ -224,6 +197,7 @@
sendRtpItem.setDeviceId(deviceId);
sendRtpItem.setChannelId(channelId);
sendRtpItem.setTcp(tcp);
+ sendRtpItem.setRtcp(rtcp);
sendRtpItem.setApp("rtp");
sendRtpItem.setLocalPort(localPort);
sendRtpItem.setServerId(userSetting.getServerId());
@@ -241,22 +215,14 @@
* @param tcp 鏄惁涓簍cp
* @return SendRtpItem
*/
- 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;
- }
- 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;
+ public SendRtpItem createSendRtpItem(MediaServerItem serverItem, String ip, int port, String ssrc, String platformId, String app, String stream, String channelId, boolean tcp, boolean rtcp){
+ // 榛樿涓洪殢鏈虹鍙�
+ int localPort = 0;
+ if (userSetting.getGbSendStreamStrict()) {
+ localPort = keepPort(serverItem, ssrc);
+ if (localPort == 0) {
+ return null;
+ }
}
SendRtpItem sendRtpItem = new SendRtpItem();
sendRtpItem.setIp(ip);
@@ -270,7 +236,44 @@
sendRtpItem.setLocalPort(localPort);
sendRtpItem.setServerId(userSetting.getServerId());
sendRtpItem.setMediaServerId(serverItem.getId());
+ sendRtpItem.setRtcp(rtcp);
return sendRtpItem;
+ }
+
+ /**
+ * 淇濇寔绔彛锛岀洿鍒伴渶瑕侀渶瑕佸彂娴佹椂鍐嶉噴鏀�
+ */
+ 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);
+ });
+ }
+ 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;
}
/**
@@ -278,6 +281,13 @@
*/
public JSONObject startSendRtpStream(MediaServerItem mediaServerItem, Map<String, Object>param) {
return zlmresTfulUtils.startSendRtp(mediaServerItem, param);
+ }
+
+ /**
+ * 璋冪敤zlm RESTFUL API 鈥斺�� startSendRtpPassive
+ */
+ public JSONObject startSendRtpPassive(MediaServerItem mediaServerItem, Map<String, Object>param) {
+ return zlmresTfulUtils.startSendRtpPassive(mediaServerItem, param);
}
/**
@@ -310,11 +320,11 @@
return 0;
}
Integer code = mediaInfo.getInteger("code");
- if ( code < 0) {
+ if (code < 0) {
logger.warn("鏌ヨ娴�({}/{})鏄惁鏈夊叾瀹冭鐪嬭�呮椂寰楀埌锛� {}", app, streamId, mediaInfo.getString("msg"));
return -1;
}
- if ( code == 0 && mediaInfo.getBoolean("online") != null && !mediaInfo.getBoolean("online")) {
+ if ( code == 0 && mediaInfo.getBoolean("online") != null && ! mediaInfo.getBoolean("online")) {
logger.warn("鏌ヨ娴�({}/{})鏄惁鏈夊叾瀹冭鐪嬭�呮椂寰楀埌锛� {}", app, streamId, mediaInfo.getString("msg"));
return -1;
}
@@ -333,12 +343,57 @@
result= true;
logger.info("[鍋滄RTP鎺ㄦ祦] 鎴愬姛");
} else {
- logger.error("[鍋滄RTP鎺ㄦ祦] 澶辫触: {}, 鍙傛暟锛歿}->\r\n{}",jsonObject.getString("msg"),jsonObject.toJSONString(param));
+ logger.error("[鍋滄RTP鎺ㄦ祦] 澶辫触: {}, 鍙傛暟锛歿}->\r\n{}",jsonObject.getString("msg"), JSON.toJSON(param), jsonObject);
}
return result;
}
- public void closeAllSendRtpStream() {
+ public JSONObject startSendRtp(MediaServerItem mediaInfo, SendRtpItem sendRtpItem) {
+ String is_Udp = sendRtpItem.isTcp() ? "0" : "1";
+ logger.info("rtp/{}寮�濮嬪悜涓婄骇鎺ㄦ祦, 鐩爣={}:{}锛孲SRC={}", sendRtpItem.getStreamId(), sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc());
+ Map<String, Object> param = new HashMap<>(12);
+ param.put("vhost","__defaultVhost__");
+ param.put("app",sendRtpItem.getApp());
+ param.put("stream",sendRtpItem.getStreamId());
+ param.put("ssrc", sendRtpItem.getSsrc());
+ param.put("src_port", sendRtpItem.getLocalPort());
+ param.put("pt", sendRtpItem.getPt());
+ param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
+ param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
+ if (!sendRtpItem.isTcp()) {
+ // udp妯″紡涓嬪紑鍚痳tcp淇濇椿
+ param.put("udp_rtcp_timeout", sendRtpItem.isRtcp()? "1":"0");
+ }
+ if (mediaInfo == null) {
+ return null;
+ }
+ // 濡傛灉鏄潪涓ユ牸妯″紡锛岄渶瑕佸叧闂鍙ｅ崰鐢�
+ JSONObject startSendRtpStreamResult = null;
+ if (sendRtpItem.getLocalPort() != 0) {
+ HookSubscribeForRtpServerTimeout hookSubscribeForRtpServerTimeout = HookSubscribeFactory.on_rtp_server_timeout(sendRtpItem.getSsrc(), null, mediaInfo.getId());
+ hookSubscribe.removeSubscribe(hookSubscribeForRtpServerTimeout);
+ if (releasePort(mediaInfo, sendRtpItem.getSsrc())) {
+ if (sendRtpItem.isTcpActive()) {
+ startSendRtpStreamResult = startSendRtpPassive(mediaInfo, param);
+ System.out.println(JSON.toJSON(param));
+ }else {
+ param.put("is_udp", is_Udp);
+ param.put("dst_url", sendRtpItem.getIp());
+ param.put("dst_port", sendRtpItem.getPort());
+ startSendRtpStreamResult = startSendRtpStream(mediaInfo, param);
+ }
+ }
+ }else {
+ if (sendRtpItem.isTcpActive()) {
+ startSendRtpStreamResult = startSendRtpPassive(mediaInfo, param);
+ }else {
+ param.put("is_udp", is_Udp);
+ param.put("dst_url", sendRtpItem.getIp());
+ param.put("dst_port", sendRtpItem.getPort());
+ startSendRtpStreamResult = startSendRtpStream(mediaInfo, param);
+ }
+ }
+ return startSendRtpStreamResult;
}
}
--
Gitblit v1.8.0