From 4604aaea99925415db8d9efe1d7e68d6f59e93c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 02 七月 2023 13:53:45 +0800
Subject: [PATCH] 优化语音对讲支持根据设备设置释放收到ACK后开始发流
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 283 +++++++++++++++++++++++++++++--------------------------
1 files changed, 149 insertions(+), 134 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 80ae95e..48fb00d 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,7 +1,8 @@
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.JSONObject;
+import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
@@ -9,10 +10,9 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
@Component
public class ZLMRTPServerFactory {
@@ -25,70 +25,24 @@
@Autowired
private UserSetting userSetting;
- private int[] portRangeArray = new int[2];
+ @Autowired
+ private ZlmHttpHookSubscribe hookSubscribe;
- 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"));
- }
- }
- }
+ @Autowired
+ private SendRtpPortManager sendRtpPortManager;
- Map<String, Object> param = new HashMap<>();
- int result = -1;
- // 璁剧疆鎺ㄦ祦绔彛
- 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) {
+ /**
+ * 寮�鍚痳tpServer
+ * @param mediaServerItem zlm鏈嶅姟瀹炰緥
+ * @param streamId 娴両d
+ * @param ssrc ssrc
+ * @param port 绔彛锛� 0/null涓轰娇鐢ㄩ殢鏈�
+ * @param reUsePort 鏄惁閲嶇敤绔彛
+ * @param tcpMode 0/null udp 妯″紡锛�1 tcp 琚姩妯″紡, 2 tcp 涓诲姩妯″紡銆�
+ * @return
+ */
+ public int createRTPServer(MediaServerItem mediaServerItem, String streamId, int ssrc, Integer port, Boolean onlyAuto, Boolean reUsePort, Integer tcpMode) {
int result = -1;
// 鏌ヨ姝tp server 鏄惁宸茬粡瀛樺湪
JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaServerItem, streamId);
@@ -103,9 +57,8 @@
param.put("stream_id", streamId);
JSONObject jsonObject = zlmresTfulUtils.closeRtpServer(mediaServerItem, param);
if (jsonObject != null ) {
- System.out.println(jsonObject);
if (jsonObject.getInteger("code") == 0) {
- return createRTPServer(mediaServerItem, streamId, ssrc, port);
+ return createRTPServer(mediaServerItem, streamId, ssrc, port,onlyAuto, reUsePort, tcpMode);
}else {
logger.warn("[寮�鍚痳tpServer], 閲嶅惎RtpServer閿欒");
}
@@ -119,8 +72,14 @@
Map<String, Object> param = new HashMap<>();
- param.put("enable_tcp", 1);
+ if (tcpMode == null) {
+ tcpMode = 0;
+ }
+ param.put("tcp_mode", tcpMode);
param.put("stream_id", streamId);
+ if (reUsePort != null) {
+ param.put("re_use_port", reUsePort?"1":"0");
+ }
// 鎺ㄦ祦绔彛璁剧疆0鍒欎娇鐢ㄩ殢鏈虹鍙�
if (port == null) {
param.put("port", 0);
@@ -128,6 +87,9 @@
param.put("port", port);
}
param.put("ssrc", ssrc);
+ if (onlyAuto != null) {
+ param.put("only_audio", onlyAuto?"1":"0");
+ }
JSONObject openRtpServerResultJson = zlmresTfulUtils.openRtpServer(mediaServerItem, param);
logger.info(JSONObject.toJSONString(openRtpServerResultJson));
if (openRtpServerResultJson != null) {
@@ -143,16 +105,16 @@
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<>();
param.put("stream_id", streamId);
JSONObject jsonObject = zlmresTfulUtils.closeRtpServer(serverItem, param);
+ logger.info("鍏抽棴RTP Server " + jsonObject);
if (jsonObject != null ) {
- System.out.println(jsonObject);
if (jsonObject.getInteger("code") == 0) {
- result = jsonObject.getInteger("hit") == 1;
+ result = jsonObject.getInteger("hit") >= 1;
}else {
logger.error("鍏抽棴RTP Server 澶辫触: " + jsonObject.getString("msg"));
}
@@ -164,32 +126,31 @@
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;
-// }
-// }
+ public void closeRtpServer(MediaServerItem serverItem, String streamId, CommonCallback<Boolean> callback) {
+ if (serverItem == null) {
+ callback.run(false);
+ return;
+ }
+ Map<String, Object> param = new HashMap<>();
+ param.put("stream_id", streamId);
+ zlmresTfulUtils.closeRtpServer(serverItem, param, jsonObject -> {
+ if (jsonObject != null ) {
+ if (jsonObject.getInteger("code") == 0) {
+ callback.run(jsonObject.getInteger("hit") == 1);
+ return;
+ }else {
+ logger.error("鍏抽棴RTP Server 澶辫触: " + jsonObject.getString("msg"));
+ }
+ }else {
+ // 妫�鏌LM鐘舵��
+ logger.error("鍏抽棴RTP Server 澶辫触: 璇锋鏌LM鏈嶅姟");
+ }
+ callback.run(false);
+ });
+
+
+ }
+
/**
* 鍒涘缓涓�涓浗鏍囨帹娴�
@@ -201,23 +162,16 @@
* @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()) {
+ localPort = sendRtpPortManager.getNextPort(serverItem.getId());
+ if (localPort == 0) {
+ return null;
+ }
}
SendRtpItem sendRtpItem = new SendRtpItem();
sendRtpItem.setIp(ip);
@@ -227,6 +181,7 @@
sendRtpItem.setDeviceId(deviceId);
sendRtpItem.setChannelId(channelId);
sendRtpItem.setTcp(tcp);
+ sendRtpItem.setRtcp(rtcp);
sendRtpItem.setApp("rtp");
sendRtpItem.setLocalPort(localPort);
sendRtpItem.setServerId(userSetting.getServerId());
@@ -244,35 +199,29 @@
* @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 = sendRtpPortManager.getNextPort(serverItem.getId());
+ if (localPort == 0) {
+ return null;
+ }
}
SendRtpItem sendRtpItem = new SendRtpItem();
sendRtpItem.setIp(ip);
sendRtpItem.setPort(port);
sendRtpItem.setSsrc(ssrc);
sendRtpItem.setApp(app);
- sendRtpItem.setStreamId(stream);
+ sendRtpItem.setStream(stream);
sendRtpItem.setPlatformId(platformId);
sendRtpItem.setChannelId(channelId);
sendRtpItem.setTcp(tcp);
sendRtpItem.setLocalPort(localPort);
sendRtpItem.setServerId(userSetting.getServerId());
sendRtpItem.setMediaServerId(serverItem.getId());
+ sendRtpItem.setRtcp(rtcp);
return sendRtpItem;
}
@@ -290,11 +239,18 @@
return zlmresTfulUtils.startSendRtpPassive(mediaServerItem, param);
}
+ public JSONObject startSendRtpPassive(MediaServerItem mediaServerItem, Map<String, Object>param, ZLMRESTfulUtils.RequestCallback callback) {
+ return zlmresTfulUtils.startSendRtpPassive(mediaServerItem, param, callback);
+ }
+
/**
* 鏌ヨ寰呰浆鎺ㄧ殑娴佹槸鍚﹀氨缁�
*/
public Boolean isRtpReady(MediaServerItem mediaServerItem, String streamId) {
JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem,"rtp", "rtsp", streamId);
+ if (mediaInfo.getInteger("code") == -2) {
+ return null;
+ }
return (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online"));
}
@@ -303,7 +259,10 @@
*/
public Boolean isStreamReady(MediaServerItem mediaServerItem, String app, String streamId) {
JSONObject mediaInfo = zlmresTfulUtils.getMediaList(mediaServerItem, app, streamId);
- return (mediaInfo.getInteger("code") == 0
+ if (mediaInfo == null || (mediaInfo.getInteger("code") == -2)) {
+ return null;
+ }
+ return (mediaInfo.getInteger("code") == 0
&& mediaInfo.getJSONArray("data") != null
&& mediaInfo.getJSONArray("data").size() > 0);
}
@@ -342,12 +301,68 @@
result= true;
logger.info("[鍋滄RTP鎺ㄦ祦] 鎴愬姛");
} else {
- logger.error("[鍋滄RTP鎺ㄦ祦] 澶辫触: {}, 鍙傛暟锛歿}->\r\n{}",jsonObject.getString("msg"),JSONObject.toJSON(param), jsonObject);
+ logger.warn("[鍋滄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.getStream(), 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.getStream());
+ 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) {
+ 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;
+ }
+
+ public Boolean updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc) {
+ boolean result = false;
+ JSONObject jsonObject = zlmresTfulUtils.updateRtpServerSSRC(mediaServerItem, streamId, ssrc);
+ if (jsonObject == null) {
+ logger.error("[鏇存柊RTPServer] 澶辫触: 璇锋鏌LM鏈嶅姟");
+ } else if (jsonObject.getInteger("code") == 0) {
+ result= true;
+ logger.info("[鏇存柊RTPServer] 鎴愬姛");
+ } else {
+ logger.error("[鏇存柊RTPServer] 澶辫触: {}, streamId锛歿}锛宻src锛歿}->\r\n{}",jsonObject.getString("msg"),
+ streamId, ssrc, jsonObject);
+ }
+ return result;
}
}
--
Gitblit v1.8.0