From 89a9ab4534f10a224f70e546db838423e84a1965 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期五, 16 七月 2021 16:34:51 +0800
Subject: [PATCH] 添加zlm集群支持
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 127 ++++++++++++++++++++++++++++++++---------
1 files changed, 98 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index 953f61d..aae9cce 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -1,12 +1,18 @@
package com.genersoft.iot.vmp.vmanager.gb28181.play;
+import com.alibaba.fastjson.JSONArray;
import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
+import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
import com.genersoft.iot.vmp.service.IMediaService;
import com.genersoft.iot.vmp.service.IPlayService;
@@ -19,7 +25,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.util.ResourceUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -32,7 +37,8 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.springframework.web.context.request.async.DeferredResult;
-import java.io.FileNotFoundException;
+import java.util.Enumeration;
+import java.util.Map;
import java.util.UUID;
import javax.sip.message.Response;
@@ -47,6 +53,9 @@
@Autowired
private SIPCommander cmder;
+
+ @Autowired
+ private VideoStreamSessionManager streamSession;
@Autowired
private IVideoManagerStorager storager;
@@ -66,6 +75,9 @@
@Autowired
private IMediaService mediaService;
+ @Autowired
+ private IMediaServerService mediaServerService;
+
@ApiOperation("寮�濮嬬偣鎾�")
@ApiImplicitParams({
@ApiImplicitParam(name = "deviceId", value = "璁惧ID", dataTypeClass = String.class),
@@ -75,8 +87,10 @@
public DeferredResult<ResponseEntity<String>> play(@PathVariable String deviceId,
@PathVariable String channelId) {
- PlayResult playResult = playService.play(deviceId, channelId, null, null);
-
+ // 鑾峰彇鍙敤鐨剒lm
+ Device device = storager.queryVideoDevice(deviceId);
+ IMediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
+ PlayResult playResult = playService.play(newMediaServerItem, deviceId, channelId, null, null);
return playResult.getResult();
}
@@ -96,8 +110,8 @@
// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
resultHolder.put(DeferredResultHolder.CALLBACK_CMD_STOP + uuid, result);
-
- cmder.streamByeCmd(deviceId, channelId, event -> {
+ Device device = storager.queryVideoDevice(deviceId);
+ cmder.streamByeCmd(deviceId, channelId, (event) -> {
StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
if (streamInfo == null) {
RequestMessage msg = new RequestMessage();
@@ -114,6 +128,7 @@
msg.setData(String.format("success"));
resultHolder.invokeResult(msg);
}
+ mediaServerService.closeRTPServer(device, channelId);
});
if (deviceId != null || channelId != null) {
@@ -159,16 +174,16 @@
logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡缁忓仠姝�!");
return new ResponseEntity<String>("鏈壘鍒拌棰戞祦淇℃伅, 瑙嗛娴佸彲鑳藉凡缁忓仠姝�", HttpStatus.OK);
}
- JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
+ IMediaServerItem mediaInfo = mediaServerService.getOne(streamInfo.getMediaServerId());
+ JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaInfo, streamId);
if (!rtpInfo.getBoolean("exist")) {
logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡鍋滄鎺ㄦ祦!");
return new ResponseEntity<String>("鎺ㄦ祦淇℃伅鍦ㄦ祦濯掍綋涓笉瀛樺湪, 瑙嗛娴佸彲鑳藉凡鍋滄鎺ㄦ祦", HttpStatus.OK);
} else {
- ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
String dstUrl = String.format("rtmp://%s:%s/convert/%s", "127.0.0.1", mediaInfo.getRtmpPort(),
streamId );
String srcUrl = String.format("rtsp://%s:%s/rtp/%s", "127.0.0.1", mediaInfo.getRtspPort(), streamId);
- JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(srcUrl, dstUrl, "1000000", true, false, null);
+ JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(mediaInfo, srcUrl, dstUrl, "1000000", true, false, null);
logger.info(jsonObject.toJSONString());
JSONObject result = new JSONObject();
if (jsonObject != null && jsonObject.getInteger("code") == 0) {
@@ -176,7 +191,7 @@
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
result.put("key", data.getString("key"));
- StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStreamWithCheck("convert", streamId);
+ StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStreamWithCheck("convert", streamId, mediaInfo.getId());
result.put("data", streamInfoResult);
}
}else {
@@ -197,25 +212,38 @@
@ApiImplicitParam(name = "key", value = "瑙嗛娴乲ey", dataTypeClass = String.class),
})
@PostMapping("/convertStop/{key}")
- public ResponseEntity<String> playConvertStop(@PathVariable String key) {
-
- JSONObject jsonObject = zlmresTfulUtils.delFFmpegSource(key);
- logger.info(jsonObject.toJSONString());
+ public ResponseEntity<String> playConvertStop(@PathVariable String key, String mediaServerId) {
JSONObject result = new JSONObject();
- if (jsonObject != null && jsonObject.getInteger("code") == 0) {
- result.put("code", 0);
- JSONObject data = jsonObject.getJSONObject("data");
- if (data != null && data.getBoolean("flag")) {
- result.put("code", "0");
- result.put("msg", "success");
- }else {
-
- }
- }else {
- result.put("code", 1);
- result.put("msg", "delFFmpegSource fail");
+ if (mediaServerId == null) {
+ result.put("code", 400);
+ result.put("msg", "mediaServerId is null");
+ return new ResponseEntity<String>( result.toJSONString(), HttpStatus.BAD_REQUEST);
}
- return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
+ IMediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ if (mediaInfo == null) {
+ result.put("code", 0);
+ result.put("msg", "浣跨敤鐨勬祦濯掍綋宸茬粡鍋滄杩愯");
+ return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
+ }else {
+ JSONObject jsonObject = zlmresTfulUtils.delFFmpegSource(mediaInfo, key);
+ logger.info(jsonObject.toJSONString());
+ if (jsonObject != null && jsonObject.getInteger("code") == 0) {
+ result.put("code", 0);
+ JSONObject data = jsonObject.getJSONObject("data");
+ if (data != null && data.getBoolean("flag")) {
+ result.put("code", "0");
+ result.put("msg", "success");
+ }else {
+
+ }
+ }else {
+ result.put("code", 1);
+ result.put("msg", "delFFmpegSource fail");
+ }
+ return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
+ }
+
+
}
@ApiOperation("璇煶骞挎挱鍛戒护")
@@ -229,7 +257,21 @@
logger.debug("璇煶骞挎挱API璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
- cmder.audioBroadcastCmd(device, event -> {
+ DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
+ if (device == null) {
+ resultHolder.put(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId, result);
+ RequestMessage msg = new RequestMessage();
+ msg.setId(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId);
+ JSONObject json = new JSONObject();
+ json.put("DeviceID", deviceId);
+ json.put("CmdType", "Broadcast");
+ json.put("Result", "Failed");
+ json.put("Description", "Device 涓嶅瓨鍦�");
+ msg.setData(json);
+ resultHolder.invokeResult(msg);
+ return result;
+ }
+ cmder.audioBroadcastCmd(device, (event) -> {
Response response = event.getResponse();
RequestMessage msg = new RequestMessage();
msg.setId(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId);
@@ -241,7 +283,7 @@
msg.setData(json);
resultHolder.invokeResult(msg);
});
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
+
result.onTimeout(() -> {
logger.warn(String.format("璇煶骞挎挱鎿嶄綔瓒呮椂, 璁惧鏈繑鍥炲簲绛旀寚浠�"));
RequestMessage msg = new RequestMessage();
@@ -258,5 +300,32 @@
return result;
}
+ @ApiOperation("鑾峰彇鎵�鏈夌殑ssrc")
+ @GetMapping("/ssrc")
+ public WVPResult<JSONObject> getSSRC() {
+ if (logger.isDebugEnabled()) {
+ logger.debug("鑾峰彇鎵�鏈夌殑ssrc");
+ }
+ JSONArray objects = new JSONArray();
+ for(Map.Entry<String, String> entry: streamSession.getSsrcMap().entrySet()) {
+ System.out.println("Key = " + entry.getKey() + ", Value = " + entry.getValue());
+ JSONObject jsonObject = new JSONObject();
+ String[] keyArray = entry.getKey().split("_");
+ jsonObject.put("deviceId", keyArray[0]);
+ jsonObject.put("channelId", keyArray[1]);
+ jsonObject.put("ssrc", entry.getValue());
+ jsonObject.put("streamId", streamSession.getStreamIdMap().get(entry.getKey()));
+ objects.add(jsonObject);
+ }
+ WVPResult<JSONObject> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("data", objects);
+ jsonObject.put("count", objects.size());
+ result.setData(jsonObject);
+ return result;
+ }
+
}
--
Gitblit v1.8.0