From ac1a4a027a7bd88efb32e9da666bdba4b5fa166f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 14 一月 2022 17:04:26 +0800
Subject: [PATCH] 支持国标级联的目录订阅功能
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java | 156 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 136 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
index daa5557..8f83e7c 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
@@ -4,6 +4,9 @@
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.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.service.IPlayService;
import io.swagger.annotations.Api;
@@ -27,7 +30,6 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.springframework.web.context.request.async.DeferredResult;
-import javax.sip.message.Response;
import java.util.UUID;
@Api(tags = "瑙嗛鍥炴斁")
@@ -56,6 +58,9 @@
@Autowired
private DeferredResultHolder resultHolder;
+ @Autowired
+ private IMediaServerService mediaServerService;
+
@ApiOperation("寮�濮嬭棰戝洖鏀�")
@ApiImplicitParams({
@ApiImplicitParam(name = "deviceId", value = "璁惧ID", dataTypeClass = String.class),
@@ -70,31 +75,52 @@
if (logger.isDebugEnabled()) {
logger.debug(String.format("璁惧鍥炴斁 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
}
- UUID uuid = UUID.randomUUID();
+ String uuid = UUID.randomUUID().toString();
+ String key = DeferredResultHolder.CALLBACK_CMD_PLAYBACK + deviceId + channelId;
DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(30000L);
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ result.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
+ return result;
+ }
+ MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(newMediaServerItem, null, true);
+
// 瓒呮椂澶勭悊
result.onTimeout(()->{
logger.warn(String.format("璁惧鍥炴斁瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+ msg.setId(uuid);
+ msg.setKey(key);
msg.setData("Timeout");
resultHolder.invokeResult(msg);
});
- Device device = storager.queryVideoDevice(deviceId);
+
StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId);
if (streamInfo != null) {
// 鍋滄涔嬪墠鐨勫洖鏀�
- cmder.streamByeCmd(streamInfo.getStreamId());
+ cmder.streamByeCmd(deviceId, channelId);
}
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result);
- cmder.playbackStreamCmd(device, channelId, startTime, endTime, (JSONObject response) -> {
- logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
- playService.onPublishHandlerForPlayBack(response, deviceId, channelId, uuid.toString());
- }, event -> {
- Response response = event.getResponse();
+ resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId, uuid, result);
+
+ if (newMediaServerItem == null) {
+ logger.warn(String.format("璁惧鍥炴斁瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
- msg.setData(String.format("鍥炴斁澶辫触锛� 閿欒鐮侊細 %s, %s", response.getStatusCode(), response.getReasonPhrase()));
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData("Timeout");
+ resultHolder.invokeResult(msg);
+ return result;
+ }
+
+ cmder.playbackStreamCmd(newMediaServerItem, ssrcInfo, device, channelId, startTime, endTime, (MediaServerItem mediaServerItem, JSONObject response) -> {
+ logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
+ playService.onPublishHandlerForPlayBack(mediaServerItem, response, deviceId, channelId, uuid.toString());
+ }, event -> {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("鍥炴斁澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
resultHolder.invokeResult(msg);
});
@@ -103,24 +129,114 @@
@ApiOperation("鍋滄瑙嗛鍥炴斁")
@ApiImplicitParams({
- @ApiImplicitParam(name = "ssrc", value = "瑙嗛娴佹爣璇�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "deviceId", value = "璁惧ID", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "channelId", value = "閫氶亾ID", dataTypeClass = String.class),
})
- @GetMapping("/stop/{ssrc}")
- public ResponseEntity<String> playStop(@PathVariable String ssrc) {
+ @GetMapping("/stop/{deviceId}/{channelId}")
+ public ResponseEntity<String> playStop(@PathVariable String deviceId, @PathVariable String channelId) {
- cmder.streamByeCmd(ssrc);
+ cmder.streamByeCmd(deviceId, channelId);
if (logger.isDebugEnabled()) {
- logger.debug(String.format("璁惧褰曞儚鍥炴斁鍋滄 API璋冪敤锛宻src锛�%s", ssrc));
+ logger.debug(String.format("璁惧褰曞儚鍥炴斁鍋滄 API璋冪敤锛宒eviceId/channelId锛�%s/%s", deviceId, channelId));
}
- if (ssrc != null) {
+ if (deviceId != null && channelId != null) {
JSONObject json = new JSONObject();
- json.put("ssrc", ssrc);
+ json.put("deviceId", deviceId);
+ json.put("channelId", channelId);
return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
} else {
logger.warn("璁惧褰曞儚鍥炴斁鍋滄API璋冪敤澶辫触锛�");
return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
}
}
+
+ @ApiOperation("鍥炴斁鏆傚仠")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "streamId", value = "鍥炴斁娴両D", dataTypeClass = String.class),
+ })
+ @GetMapping("/pause/{streamId}")
+ public ResponseEntity<String> playPause(@PathVariable String streamId) {
+ logger.info("playPause: "+streamId);
+ JSONObject json = new JSONObject();
+ StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
+ if (null == streamInfo) {
+ json.put("msg", "streamId涓嶅瓨鍦�");
+ logger.warn("streamId涓嶅瓨鍦�!");
+ return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
+ }
+ Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
+ cmder.playPauseCmd(device, streamInfo);
+ json.put("msg", "ok");
+ return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
+ }
+
+ @ApiOperation("鍥炴斁鎭㈠")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "streamId", value = "鍥炴斁娴両D", dataTypeClass = String.class),
+ })
+ @GetMapping("/resume/{streamId}")
+ public ResponseEntity<String> playResume(@PathVariable String streamId) {
+ logger.info("playResume: "+streamId);
+ JSONObject json = new JSONObject();
+ StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
+ if (null == streamInfo) {
+ json.put("msg", "streamId涓嶅瓨鍦�");
+ logger.warn("streamId涓嶅瓨鍦�!");
+ return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
+ }
+ Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
+ cmder.playResumeCmd(device, streamInfo);
+ json.put("msg", "ok");
+ return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
+ }
+
+ @ApiOperation("鍥炴斁鎷栧姩鎾斁")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "streamId", value = "鍥炴斁娴両D", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "seekTime", value = "鎷栧姩鍋忕Щ閲忥紝鍗曚綅s", dataTypeClass = Long.class),
+ })
+ @GetMapping("/seek/{streamId}/{seekTime}")
+ public ResponseEntity<String> playSeek(@PathVariable String streamId, @PathVariable long seekTime) {
+ logger.info("playSeek: "+streamId+", "+seekTime);
+ JSONObject json = new JSONObject();
+ StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
+ if (null == streamInfo) {
+ json.put("msg", "streamId涓嶅瓨鍦�");
+ logger.warn("streamId涓嶅瓨鍦�!");
+ return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
+ }
+ Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
+ cmder.playSeekCmd(device, streamInfo, seekTime);
+ json.put("msg", "ok");
+ return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
+ }
+
+ @ApiOperation("鍥炴斁鍊嶉�熸挱鏀�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "streamId", value = "鍥炴斁娴両D", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "speed", value = "鍊嶉��0.25 0.5 1銆�2銆�4", dataTypeClass = Double.class),
+ })
+ @GetMapping("/speed/{streamId}/{speed}")
+ public ResponseEntity<String> playSpeed(@PathVariable String streamId, @PathVariable Double speed) {
+ logger.info("playSpeed: "+streamId+", "+speed);
+ JSONObject json = new JSONObject();
+ StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
+ if (null == streamInfo) {
+ json.put("msg", "streamId涓嶅瓨鍦�");
+ logger.warn("streamId涓嶅瓨鍦�!");
+ return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
+ }
+ if(speed != 0.25 && speed != 0.5 && speed != 1 && speed != 2.0 && speed != 4.0) {
+ json.put("msg", "涓嶆敮鎸佺殑speed锛�0.25 0.5 1銆�2銆�4锛�");
+ logger.warn("涓嶆敮鎸佺殑speed锛� " + speed);
+ return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
+ }
+ Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
+ cmder.playSpeedCmd(device, streamInfo, speed);
+ json.put("msg", "ok");
+ return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
+ }
+
}
--
Gitblit v1.8.0