From 44d216100b45c3337c593ee82ee68e7e0f35d24b Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期三, 16 十二月 2020 20:29:19 +0800
Subject: [PATCH] 与master分支同步
---
src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java | 117 +++++++++++++++-------------------------------------------
1 files changed, 30 insertions(+), 87 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 16713fe..2e32b1b 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
@@ -3,7 +3,10 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.genersoft.iot.vmp.common.StreamInfo;
+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.vmanager.service.IPlayService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +25,9 @@
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 java.util.UUID;
@CrossOrigin
@RestController
@@ -39,105 +45,42 @@
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
- @Value("${media.closeWaitRTPInfo}")
- private boolean closeWaitRTPInfo;
+ @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) {
+ 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));
}
-
- 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);
- }
-
+ 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.queryPlaybackByDevice(deviceId, channelId);
-
if (streamInfo != null) {
+ // 鍋滄涔嬪墠鐨勫洖鏀�
cmder.streamByeCmd(streamInfo.getSsrc());
}
+ 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());
+ });
- // }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.stopPlayback(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;
- boolean rtpPushed = false;
- long lockStartTime = System.currentTimeMillis();
- JSONObject rtpInfo = null;
-
- if (closeWaitRTPInfo) {
- String flv = storager.getMediaInfo().getWanIp() + ":" + storager.getMediaInfo().getHttpPort() + "/rtp/"
- + streamId + ".flv";
- streamInfo.setFlv("http://" + flv);
- streamInfo.setWs_flv("ws://" + flv);
- storager.startPlayback(streamInfo);
- } else {
- while (lockFlag) {
- try {
- if (System.currentTimeMillis() - lockStartTime > 75 * 1000) {
- storager.stopPlayback(streamInfo);
- logger.info("鎾斁绛夊緟瓒呮椂");
- return new ResponseEntity<String>("timeout", HttpStatus.OK);
- } else {
- streamInfo = storager.queryPlaybackByDevice(deviceId, channelId);
- if (!rtpPushed) {
- logger.info("鏌ヨRTP鎺ㄦ祦淇℃伅...");
- rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
- }
- if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo != null
- && streamInfo.getFlv() != null) {
- logger.info("鏌ヨ娴佺紪鐮佷俊鎭細" + streamInfo.getFlv());
- rtpPushed = true;
- Thread.sleep(2000);
- JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId);
- if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) {
- lockFlag = false;
- logger.info("娴佺紪鐮佷俊鎭凡鑾峰彇");
- JSONArray tracks = mediaInfo.getJSONArray("tracks");
- streamInfo.setTracks(tracks);
- storager.startPlayback(streamInfo);
- } else {
- logger.info("娴佺紪鐮佷俊鎭湭鑾峰彇锛�2绉掑悗閲嶈瘯...");
- }
- } 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")
--
Gitblit v1.8.0