From 56859d09df8d4226882d43934acf32d60a3b51d7 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 30 三月 2021 18:46:34 +0800
Subject: [PATCH] 添加推流列表和拉流代理，下一步与国标关联
---
src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java | 142 +++++++++++++++++++---------------------------
1 files changed, 59 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
index e53cbbf..020a26c 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
@@ -1,19 +1,19 @@
package com.genersoft.iot.vmp.vmanager.playback;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
+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.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.vmanager.service.IPlayService;
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.util.StringUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -21,111 +21,87 @@
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import org.springframework.web.context.request.async.DeferredResult;
+
+import javax.sip.message.Response;
+import java.util.UUID;
@CrossOrigin
@RestController
@RequestMapping("/api")
public class PlaybackController {
-
+
private final static Logger logger = LoggerFactory.getLogger(PlaybackController.class);
-
+
@Autowired
private SIPCommander cmder;
-
+
@Autowired
private IVideoManagerStorager storager;
@Autowired
- private ZLMRESTfulUtils zlmresTfulUtils;
+ private IRedisCatchStorage redisCatchStorage;
+
+ // @Autowired
+ // private ZLMRESTfulUtils zlmresTfulUtils;
+
+ @Autowired
+ private IPlayService playService;
+
+ @Autowired
+ private DeferredResultHolder resultHolder;
@GetMapping("/playback/{deviceId}/{channelId}")
- public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId, String startTime, String endTime){
-
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("璁惧鍥炴斁 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s",deviceId, channelId));
- }
-
- if (StringUtils.isEmpty(deviceId) || StringUtils.isEmpty(channelId)) {
- String log = String.format("璁惧鍥炴斁 API璋冪敤澶辫触锛宒eviceId锛�%s 锛宑hannelId锛�%s",deviceId, channelId);
- logger.warn(log);
- return new ResponseEntity<String>(log,HttpStatus.BAD_REQUEST);
- }
+ public DeferredResult<ResponseEntity<String>> play(@PathVariable String deviceId, @PathVariable String channelId, String startTime,
+ String endTime) {
+ if (logger.isDebugEnabled()) {
+ logger.debug(String.format("璁惧鍥炴斁 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
+ }
+ UUID uuid = UUID.randomUUID();
+ DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
+ // 瓒呮椂澶勭悊
+ result.onTimeout(()->{
+ logger.warn(String.format("璁惧鍥炴斁瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
+ RequestMessage msg = new RequestMessage();
+ msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+ msg.setData("Timeout");
+ resultHolder.invokeResult(msg);
+ });
Device device = storager.queryVideoDevice(deviceId);
- StreamInfo streamInfo = storager.queryPlayBlackByDevice(deviceId, channelId);
-
+ StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId);
if (streamInfo != null) {
- cmder.streamByeCmd(streamInfo.getSsrc());
+ // 鍋滄涔嬪墠鐨勫洖鏀�
+ cmder.streamByeCmd(streamInfo.getStreamId());
}
+ 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();
+ RequestMessage msg = new RequestMessage();
+ msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+ msg.setData(String.format("鍥炴斁澶辫触锛� 閿欒鐮侊細 %s, %s", response.getStatusCode(), response.getReasonPhrase()));
+ resultHolder.invokeResult(msg);
+ });
-// }else {
-// String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
-// JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
-// if (rtpInfo.getBoolean("exist")) {
-// return new ResponseEntity<String>(JSON.toJSONString(streamInfo),HttpStatus.OK);
-// }else {
-// storager.stopPlayBlack(streamInfo);
-// streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime);
-// }
-// }
- streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime);
-
- String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
-
- if (logger.isDebugEnabled()) {
- logger.debug("璁惧鍥炴斁 API璋冪敤锛宻src锛�" + streamInfo.getSsrc() + ",ZLMedia streamId:" + streamId);
- }
- // 绛夊緟鎺ㄦ祦, TODO 榛樿瓒呮椂15s
- boolean lockFlag = true;
- long lockStartTime = System.currentTimeMillis();
- while (lockFlag) {
- try {
- if (System.currentTimeMillis() - lockStartTime > 75 * 1000) {
- storager.stopPlayBlack(streamInfo);
- return new ResponseEntity<String>("timeout",HttpStatus.OK);
- }else {
- streamInfo = storager.queryPlayBlackByDevice(deviceId, channelId);
- JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
- if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo.getFlv() != null){
- JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId);
- if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) {
- lockFlag = false;
- JSONArray tracks = mediaInfo.getJSONArray("tracks");
- streamInfo.setTracks(tracks);
- storager.startPlayBlack(streamInfo);
- }else {
-
- }
- }else {
- Thread.sleep(2000);
- continue;
- };
- }
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- if(streamInfo!=null) {
- return new ResponseEntity<String>(JSON.toJSONString(streamInfo),HttpStatus.OK);
- } else {
- logger.warn("璁惧鍥炴斁API璋冪敤澶辫触锛�");
- return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
- }
+ return result;
}
-
+
@RequestMapping("/playback/{ssrc}/stop")
- public ResponseEntity<String> playStop(@PathVariable String ssrc){
-
+ public ResponseEntity<String> playStop(@PathVariable String ssrc) {
+
cmder.streamByeCmd(ssrc);
-
+
if (logger.isDebugEnabled()) {
logger.debug(String.format("璁惧褰曞儚鍥炴斁鍋滄 API璋冪敤锛宻src锛�%s", ssrc));
}
-
- if(ssrc!=null) {
+
+ if (ssrc != null) {
JSONObject json = new JSONObject();
json.put("ssrc", ssrc);
- return new ResponseEntity<String>(json.toString(),HttpStatus.OK);
+ return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
} else {
logger.warn("璁惧褰曞儚鍥炴斁鍋滄API璋冪敤澶辫触锛�");
return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
--
Gitblit v1.8.0