From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:18:49 +0800
Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 305 ++++++++++++++++++++++++--------------------------
1 files changed, 147 insertions(+), 158 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 4297bb2..d22e56b 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
@@ -2,26 +2,29 @@
import com.alibaba.fastjson.JSONArray;
import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
+import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
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.MediaServerItem;
+import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
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;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -31,16 +34,16 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.springframework.web.context.request.async.DeferredResult;
-import java.util.Enumeration;
-import java.util.Map;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
+import java.util.List;
import java.util.UUID;
-import javax.sip.message.Response;
-
-@Api(tags = "鍥芥爣璁惧鐐规挱")
+@Tag(name = "鍥芥爣璁惧鐐规挱")
@CrossOrigin
@RestController
@RequestMapping("/api/play")
@@ -55,7 +58,7 @@
private VideoStreamSessionManager streamSession;
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -72,174 +75,158 @@
@Autowired
private IMediaService mediaService;
- @ApiOperation("寮�濮嬬偣鎾�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value = "閫氶亾ID", dataTypeClass = String.class),
- })
+ @Autowired
+ private IMediaServerService mediaServerService;
+
+ @Operation(summary = "寮�濮嬬偣鎾�")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@GetMapping("/start/{deviceId}/{channelId}")
- public DeferredResult<ResponseEntity<String>> play(@PathVariable String deviceId,
+ public DeferredResult<WVPResult<StreamInfo>> play(@PathVariable String deviceId,
@PathVariable String channelId) {
- PlayResult playResult = playService.play(deviceId, channelId, null, null);
-
+ // 鑾峰彇鍙敤鐨剒lm
+ Device device = storager.queryVideoDevice(deviceId);
+ MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
+ PlayResult playResult = playService.play(newMediaServerItem, deviceId, channelId, null, null, null);
return playResult.getResult();
}
- @ApiOperation("鍋滄鐐规挱")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value = "閫氶亾ID", dataTypeClass = String.class),
- })
+
+ @Operation(summary = "鍋滄鐐规挱")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@GetMapping("/stop/{deviceId}/{channelId}")
- public DeferredResult<ResponseEntity<String>> playStop(@PathVariable String deviceId, @PathVariable String channelId) {
+ public JSONObject playStop(@PathVariable String deviceId, @PathVariable String channelId) {
- logger.debug(String.format("璁惧棰勮/鍥炴斁鍋滄API璋冪敤锛宻treamId锛�%s/$s", deviceId, channelId ));
+ logger.debug(String.format("璁惧棰勮/鍥炴斁鍋滄API璋冪敤锛宻treamId锛�%s_%s", deviceId, channelId ));
- UUID uuid = UUID.randomUUID();
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
-
- // 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_STOP + uuid, result);
-
- cmder.streamByeCmd(deviceId, channelId, event -> {
- StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
- if (streamInfo == null) {
- RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
- msg.setData("鐐规挱鏈壘鍒�");
- resultHolder.invokeResult(msg);
- storager.stopPlay(deviceId, channelId);
- }else {
- redisCatchStorage.stopPlay(streamInfo);
- storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
- RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
- //Response response = event.getResponse();
- msg.setData(String.format("success"));
- resultHolder.invokeResult(msg);
- }
- });
-
- if (deviceId != null || channelId != null) {
- JSONObject json = new JSONObject();
- json.put("deviceId", deviceId);
- json.put("channelId", channelId);
- RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
- msg.setData(json.toString());
- resultHolder.invokeResult(msg);
- } else {
- logger.warn("璁惧棰勮/鍥炴斁鍋滄API璋冪敤澶辫触锛�");
- RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
- msg.setData("streamId null");
- resultHolder.invokeResult(msg);
+ if (deviceId == null || channelId == null) {
+ throw new ControllerException(ErrorCode.ERROR400);
}
- // 瓒呮椂澶勭悊
- result.onTimeout(()->{
- logger.warn(String.format("璁惧棰勮/鍥炴斁鍋滄瓒呮椂锛宒eviceId/channelId锛�%s/$s ", deviceId, channelId));
- RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
- msg.setData("Timeout");
- resultHolder.invokeResult(msg);
- });
- return result;
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "璁惧[" + deviceId + "]涓嶅瓨鍦�");
+ }
+
+ StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
+ if (streamInfo == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鐐规挱鏈壘鍒�");
+ }
+
+ try {
+ logger.warn("[鍋滄鐐规挱] {}/{}", device.getDeviceId(), channelId);
+ cmder.streamByeCmd(device, channelId, streamInfo.getStream(), null, null);
+ } catch (InvalidArgumentException | SipException | ParseException | SsrcTransactionNotFoundException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍋滄鐐规挱锛� 鍙戦�丅YE: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+ }
+ redisCatchStorage.stopPlay(streamInfo);
+
+ storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
+ JSONObject json = new JSONObject();
+ json.put("deviceId", deviceId);
+ json.put("channelId", channelId);
+ return json;
+
}
/**
* 灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac
* @param streamId 娴両D
- * @return
*/
- @ApiOperation("灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "streamId", value = "瑙嗛娴両D", dataTypeClass = String.class),
- })
+ @Operation(summary = "灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac")
+ @Parameter(name = "streamId", description = "瑙嗛娴両D", required = true)
@PostMapping("/convert/{streamId}")
- public ResponseEntity<String> playConvert(@PathVariable String streamId) {
- StreamInfo streamInfo = streamId.startsWith("gb_play_") ? redisCatchStorage.queryPlayByStreamId(streamId) : redisCatchStorage.queryPlaybackByStreamId(streamId);
+ public JSONObject playConvert(@PathVariable String streamId) {
+ StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
+ if (streamInfo == null) {
+ streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
+ }
if (streamInfo == null) {
logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡缁忓仠姝�!");
- return new ResponseEntity<String>("鏈壘鍒拌棰戞祦淇℃伅, 瑙嗛娴佸彲鑳藉凡缁忓仠姝�", HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒拌棰戞祦淇℃伅, 瑙嗛娴佸彲鑳藉凡缁忓仠姝�");
}
- JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
+ MediaServerItem mediaInfo = mediaServerService.getOne(streamInfo.getMediaServerId());
+ JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaInfo, streamId);
if (!rtpInfo.getBoolean("exist")) {
logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡鍋滄鎺ㄦ祦!");
- return new ResponseEntity<String>("鎺ㄦ祦淇℃伅鍦ㄦ祦濯掍綋涓笉瀛樺湪, 瑙嗛娴佸彲鑳藉凡鍋滄鎺ㄦ祦", HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒拌棰戞祦淇℃伅, 瑙嗛娴佸彲鑳藉凡鍋滄鎺ㄦ祦");
} 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) {
- result.put("code", 0);
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
- result.put("key", data.getString("key"));
- StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStreamWithCheck("convert", streamId);
- result.put("data", streamInfoResult);
+ JSONObject result = new JSONObject();
+ result.put("key", data.getString("key"));
+ StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStreamWithCheck("convert", streamId, mediaInfo.getId(), false);
+ result.put("StreamInfo", streamInfoResult);
+ return result;
+ }else {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "杞爜澶辫触");
}
}else {
- result.put("code", 1);
- result.put("msg", "cover fail");
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "杞爜澶辫触");
}
- return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
}
}
/**
* 缁撴潫杞爜
- * @param key
- * @return
*/
- @ApiOperation("缁撴潫杞爜")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "key", value = "瑙嗛娴乲ey", dataTypeClass = String.class),
- })
+ @Operation(summary = "缁撴潫杞爜")
+ @Parameter(name = "key", description = "瑙嗛娴乲ey", required = true)
+ @Parameter(name = "mediaServerId", description = "娴佸獟浣撴湇鍔D", required = true)
@PostMapping("/convertStop/{key}")
- public ResponseEntity<String> playConvertStop(@PathVariable String key) {
-
- JSONObject jsonObject = zlmresTfulUtils.delFFmpegSource(key);
- logger.info(jsonObject.toJSONString());
- 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");
+ public void playConvertStop(@PathVariable String key, String mediaServerId) {
+ if (mediaServerId == null) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "娴佸獟浣擄細" + mediaServerId + "涓嶅瓨鍦�" );
}
- return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ if (mediaInfo == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "浣跨敤鐨勬祦濯掍綋宸茬粡鍋滄杩愯" );
+ }else {
+ JSONObject jsonObject = zlmresTfulUtils.delFFmpegSource(mediaInfo, key);
+ logger.info(jsonObject.toJSONString());
+ if (jsonObject != null && jsonObject.getInteger("code") == 0) {
+ JSONObject data = jsonObject.getJSONObject("data");
+ if (data == null || data.getBoolean("flag") == null || !data.getBoolean("flag")) {
+ throw new ControllerException(ErrorCode.ERROR100 );
+ }
+ }else {
+ throw new ControllerException(ErrorCode.ERROR100 );
+ }
+ }
}
- @ApiOperation("璇煶骞挎挱鍛戒护")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧Id", dataTypeClass = String.class),
- })
+ @Operation(summary = "璇煶骞挎挱鍛戒护")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/broadcast/{deviceId}")
@PostMapping("/broadcast/{deviceId}")
- public DeferredResult<ResponseEntity<String>> broadcastApi(@PathVariable String deviceId) {
+ public DeferredResult<String> broadcastApi(@PathVariable String deviceId) {
if (logger.isDebugEnabled()) {
logger.debug("璇煶骞挎挱API璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
+ DeferredResult<String> result = new DeferredResult<>(3 * 1000L);
+ String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId;
+ if (resultHolder.exist(key, null)) {
+ result.setResult("璁惧浣跨敤涓�");
+ return result;
+ }
+ String uuid = UUID.randomUUID().toString();
if (device == null) {
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId, result);
+
+ resultHolder.put(key, key, result);
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId);
+ msg.setKey(key);
+ msg.setId(uuid);
JSONObject json = new JSONObject();
json.put("DeviceID", deviceId);
json.put("CmdType", "Broadcast");
@@ -249,23 +236,29 @@
resultHolder.invokeResult(msg);
return result;
}
- cmder.audioBroadcastCmd(device, event -> {
- Response response = event.getResponse();
- 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", String.format("璇煶骞挎挱鎿嶄綔澶辫触锛岄敊璇爜锛� %s, %s", response.getStatusCode(), response.getReasonPhrase()));
- msg.setData(json);
- resultHolder.invokeResult(msg);
- });
+ try {
+ cmder.audioBroadcastCmd(device, (event) -> {
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ msg.setId(uuid);
+ JSONObject json = new JSONObject();
+ json.put("DeviceID", deviceId);
+ json.put("CmdType", "Broadcast");
+ json.put("Result", "Failed");
+ json.put("Description", String.format("璇煶骞挎挱鎿嶄綔澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg));
+ msg.setData(json);
+ resultHolder.invokeResult(msg);
+ });
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 璇煶骞挎挱: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+ }
result.onTimeout(() -> {
- logger.warn(String.format("璇煶骞挎挱鎿嶄綔瓒呮椂, 璁惧鏈繑鍥炲簲绛旀寚浠�"));
+ logger.warn("璇煶骞挎挱鎿嶄綔瓒呮椂, 璁惧鏈繑鍥炲簲绛旀寚浠�");
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId);
+ msg.setKey(key);
+ msg.setId(uuid);
JSONObject json = new JSONObject();
json.put("DeviceID", deviceId);
json.put("CmdType", "Broadcast");
@@ -274,35 +267,31 @@
msg.setData(json);
resultHolder.invokeResult(msg);
});
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId, result);
+ resultHolder.put(key, uuid, result);
return result;
}
- @ApiOperation("鑾峰彇鎵�鏈夌殑ssrc")
+ @Operation(summary = "鑾峰彇鎵�鏈夌殑ssrc")
@GetMapping("/ssrc")
- public WVPResult<JSONObject> getSSRC() {
+ public 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());
+ List<SsrcTransaction> allSsrc = streamSession.getAllSsrc();
+ for (SsrcTransaction transaction : allSsrc) {
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()));
+ jsonObject.put("deviceId", transaction.getDeviceId());
+ jsonObject.put("channelId", transaction.getChannelId());
+ jsonObject.put("ssrc", transaction.getSsrc());
+ jsonObject.put("streamId", transaction.getStream());
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;
+ return jsonObject;
}
}
--
Gitblit v1.8.0