From 407a5b77c3586fef44dc771e48f05c2354740795 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期二, 07 九月 2021 09:20:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 128 +++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 63 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 ed069f8..3593102 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
@@ -2,9 +2,8 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.conf.MediaConfig;
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;
@@ -19,28 +18,19 @@
private Logger logger = LoggerFactory.getLogger("ZLMRTPServerFactory");
@Autowired
- private MediaConfig mediaConfig;
-
- @Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
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();
- if (jsonObject != null) {
- 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"));
- }
+ public int createRTPServer(MediaServerItem mediaServerItem, String streamId) {
+ Map<String, Integer> currentStreams = new HashMap<>();
+ 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"));
}
}
}
@@ -48,34 +38,34 @@
if (currentStreams.get(streamId) != null) {
Map<String, Object> closeRtpServerParam = new HashMap<>();
closeRtpServerParam.put("stream_id", streamId);
- zlmresTfulUtils.closeRtpServer(closeRtpServerParam);
+ zlmresTfulUtils.closeRtpServer(mediaServerItem, closeRtpServerParam);
currentStreams.remove(streamId);
}
Map<String, Object> param = new HashMap<>();
int result = -1;
- int newPort = getPortFromportRange();
+ int newPort = getPortFromportRange(mediaServerItem);
param.put("port", newPort);
param.put("enable_tcp", 1);
param.put("stream_id", streamId);
- JSONObject jsonObject = zlmresTfulUtils.openRtpServer(param);
+ JSONObject openRtpServerResultJson = zlmresTfulUtils.openRtpServer(mediaServerItem, param);
- if (jsonObject != null) {
- switch (jsonObject.getInteger("code")){
+ if (openRtpServerResultJson != null) {
+ switch (openRtpServerResultJson.getInteger("code")){
case 0:
result= newPort;
break;
case -300: // id宸茬粡瀛樺湪, 鍙兘宸茬粡鍦ㄥ叾浠栫鍙ｆ帹娴�
Map<String, Object> closeRtpServerParam = new HashMap<>();
closeRtpServerParam.put("stream_id", streamId);
- zlmresTfulUtils.closeRtpServer(closeRtpServerParam);
+ zlmresTfulUtils.closeRtpServer(mediaServerItem, closeRtpServerParam);
result = newPort;
break;
case -400: // 绔彛鍗犵敤
- result= createRTPServer(streamId);
+ result= createRTPServer(mediaServerItem, streamId);
break;
default:
- logger.error("鍒涘缓RTP Server 澶辫触 {}: " + jsonObject.getString("msg"), newPort);
+ logger.error("鍒涘缓RTP Server 澶辫触 {}: " + openRtpServerResultJson.getString("msg"), newPort);
break;
}
}else {
@@ -85,39 +75,45 @@
return result;
}
- public boolean closeRTPServer(String streamId) {
+ public boolean closeRTPServer(MediaServerItem serverItem, 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;
+ 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 {
- logger.error("鍏抽棴RTP Server 澶辫触: " + jsonObject.getString("msg"));
+ // 妫�鏌LM鐘舵��
+ logger.error("鍏抽棴RTP Server 澶辫触: 璇锋鏌LM鏈嶅姟");
}
- }else {
- // 妫�鏌LM鐘舵��
- logger.error("鍏抽棴RTP Server 澶辫触: 璇锋鏌LM鏈嶅姟");
}
return result;
}
- private int getPortFromportRange() {
+ private int getPortFromportRange(MediaServerItem mediaServerItem) {
+ int currentPort = mediaServerItem.getCurrentPort();
if (currentPort == 0) {
- String[] portRangeStrArray = mediaConfig.getRtpPortRange().split(",");
+ String[] portRangeStrArray = mediaServerItem.getRtpPortRange().split(",");
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++;
}
- return currentPort++;
+ currentPort++;
+ mediaServerItem.setCurrentPort(currentPort);
+ return currentPort;
}
}
@@ -131,11 +127,15 @@
* @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());
+ 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) {
- closeRTPServer(playSsrc);
+ // TODO 楂樺苟鍙戞椂鍙兘鍥犱负鏈斁鍏ョ紦瀛樿�宻src鍐茬獊
+ serverItem.getSsrcConfig().releaseSsrc(playSsrc);
+ closeRTPServer(serverItem, playSsrc);
}else {
logger.error("娌℃湁鍙敤鐨勭鍙�");
return null;
@@ -150,6 +150,7 @@
sendRtpItem.setTcp(tcp);
sendRtpItem.setApp("rtp");
sendRtpItem.setLocalPort(localPort);
+ sendRtpItem.setMediaServerId(serverItem.getId());
return sendRtpItem;
}
@@ -163,11 +164,13 @@
* @param tcp 鏄惁涓簍cp
* @return SendRtpItem
*/
- public SendRtpItem createSendRtpItem(String ip, int port, String ssrc, String platformId, String app, String stream, String channelId, boolean tcp){
- String playSsrc = SsrcUtil.getPlaySsrc();
- int localPort = createRTPServer(SsrcUtil.getPlaySsrc());
+ 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) {
- closeRTPServer(playSsrc);
+ // TODO 楂樺苟鍙戞椂鍙兘鍥犱负鏈斁鍏ョ紦瀛樿�宻src鍐茬獊
+ serverItem.getSsrcConfig().releaseSsrc(ssrc);
+ closeRTPServer(serverItem, playSsrc);
}else {
logger.error("娌℃湁鍙敤鐨勭鍙�");
return null;
@@ -182,21 +185,21 @@
sendRtpItem.setChannelId(channelId);
sendRtpItem.setTcp(tcp);
sendRtpItem.setLocalPort(localPort);
+ sendRtpItem.setMediaServerId(serverItem.getId());
return sendRtpItem;
}
/**
* 璋冪敤zlm RESTful API 鈥斺�� startSendRtp
*/
- public Boolean startSendRtpStream(Map<String, Object>param) {
+ public Boolean startSendRtpStream(MediaServerItem mediaServerItem, Map<String, Object>param) {
Boolean result = false;
- JSONObject jsonObject = zlmresTfulUtils.startSendRtp(param);
- logger.info(jsonObject.toJSONString());
+ JSONObject jsonObject = zlmresTfulUtils.startSendRtp(mediaServerItem, param);
if (jsonObject == null) {
logger.error("RTP鎺ㄦ祦澶辫触: 璇锋鏌LM鏈嶅姟");
} else if (jsonObject.getInteger("code") == 0) {
result= true;
- logger.info("RTP鎺ㄦ祦璇锋眰鎴愬姛锛屾湰鍦版帹娴佺鍙ｏ細" + jsonObject.getString("local_port"));
+ logger.info("RTP鎺ㄦ祦[ {}/{} ]璇锋眰鎴愬姛锛屾湰鍦版帹娴佺鍙ｏ細{}" ,param.get("app"), param.get("stream"), jsonObject.getString("local_port"));
} else {
logger.error("RTP鎺ㄦ祦澶辫触: " + jsonObject.getString("msg"));
}
@@ -206,16 +209,16 @@
/**
* 鏌ヨ寰呰浆鎺ㄧ殑娴佹槸鍚﹀氨缁�
*/
- 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", "rtmp", streamId);
return (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online"));
}
/**
* 鏌ヨ寰呰浆鎺ㄧ殑娴佹槸鍚﹀氨缁�
*/
- public Boolean isStreamReady(String app, String streamId) {
- JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(app, "rtmp", streamId);
+ 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"));
}
@@ -224,18 +227,17 @@
* @param streamId
* @return
*/
- public int totalReaderCount(String app, String streamId) {
- JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(app, "rtmp", streamId);
+ public int totalReaderCount(MediaServerItem mediaServerItem, String app, String streamId) {
+ JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem, app, "rtmp", streamId);
return mediaInfo.getInteger("totalReaderCount");
}
/**
* 璋冪敤zlm RESTful API 鈥斺�� stopSendRtp
*/
- public Boolean stopSendRtpStream(Map<String, Object>param) {
+ public Boolean stopSendRtpStream(MediaServerItem mediaServerItem, Map<String, Object>param) {
Boolean result = false;
- JSONObject jsonObject = zlmresTfulUtils.stopSendRtp(param);
- logger.info(jsonObject.toJSONString());
+ JSONObject jsonObject = zlmresTfulUtils.stopSendRtp(mediaServerItem, param);
if (jsonObject == null) {
logger.error("鍋滄RTP鎺ㄦ祦澶辫触: 璇锋鏌LM鏈嶅姟");
} else if (jsonObject.getInteger("code") == 0) {
--
Gitblit v1.8.0