From 1b200bcc904d088b31ceaf1e9261b5433d9322a6 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期五, 15 一月 2021 00:00:45 +0800
Subject: [PATCH] 将上级平台标识改为serverGBId
---
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 258 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 222 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
index c0d2233..3bd828a 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
@@ -1,8 +1,20 @@
package com.genersoft.iot.vmp.vmanager.play;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+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.ZLMRTPServerFactory;
+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.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin;
@@ -16,57 +28,231 @@
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.text.DecimalFormat;
+import java.util.UUID;
@CrossOrigin
@RestController
@RequestMapping("/api")
public class PlayController {
-
+
private final static Logger logger = LoggerFactory.getLogger(PlayController.class);
-
+
@Autowired
private SIPCommander cmder;
-
+
@Autowired
private IVideoManagerStorager storager;
-
+
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private ZLMRESTfulUtils zlmresTfulUtils;
+
+ @Autowired
+ private DeferredResultHolder resultHolder;
+
+ @Autowired
+ private IPlayService playService;
+
@GetMapping("/play/{deviceId}/{channelId}")
- public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId){
-
+ public DeferredResult<ResponseEntity<String>> play(@PathVariable String deviceId,
+ @PathVariable String channelId) {
+
+
Device device = storager.queryVideoDevice(deviceId);
- String ssrc = cmder.playStreamCmd(device, channelId);
-
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("璁惧棰勮 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s",deviceId, channelId));
- logger.debug("璁惧棰勮 API璋冪敤锛宻src锛�"+ssrc+",ZLMedia streamId:"+Integer.toHexString(Integer.parseInt(ssrc)));
- }
-
- if(ssrc!=null) {
- JSONObject json = new JSONObject();
- json.put("ssrc", ssrc);
- return new ResponseEntity<String>(json.toString(),HttpStatus.OK);
+ StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
+
+ UUID uuid = UUID.randomUUID();
+ DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
+
+ // 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
+ resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result);
+
+ if (streamInfo == null) {
+ // 鍙戦�佺偣鎾秷鎭�
+ cmder.playStreamCmd(device, channelId, (JSONObject response) -> {
+ logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
+ playService.onPublishHandlerForPlay(response, deviceId, channelId, uuid.toString());
+ }, event -> {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+ Response response = event.getResponse();
+ msg.setData(String.format("鐐规挱澶辫触锛� 閿欒鐮侊細 %s, %s", response.getStatusCode(), response.getReasonPhrase()));
+ resultHolder.invokeResult(msg);
+ });
} else {
- logger.warn("璁惧棰勮API璋冪敤澶辫触锛�");
- return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+ String streamId = streamInfo.getStreamId();
+ JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
+ if (rtpInfo.getBoolean("exist")) {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+ msg.setData(JSON.toJSONString(streamInfo));
+ resultHolder.invokeResult(msg);
+ } else {
+ redisCatchStorage.stopPlay(streamInfo);
+ storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
+ cmder.playStreamCmd(device, channelId, (JSONObject response) -> {
+ logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
+ playService.onPublishHandlerForPlay(response, deviceId, channelId, uuid.toString());
+ }, event -> {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+ Response response = event.getResponse();
+ msg.setData(String.format("鐐规挱澶辫触锛� 閿欒鐮侊細 %s, %s", response.getStatusCode(), response.getReasonPhrase()));
+ resultHolder.invokeResult(msg);
+ });
+ }
+ }
+
+ // 瓒呮椂澶勭悊
+ result.onTimeout(()->{
+ logger.warn(String.format("璁惧鐐规挱瓒呮椂锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
+ // 閲婃斁rtpserver
+ cmder.closeRTPServer(device, channelId);
+ RequestMessage msg = new RequestMessage();
+ msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+ msg.setData("Timeout");
+ resultHolder.invokeResult(msg);
+ });
+ return result;
+ }
+
+ @PostMapping("/play/{streamId}/stop")
+ public DeferredResult<ResponseEntity<String>> playStop(@PathVariable String streamId) {
+
+ logger.debug(String.format("璁惧棰勮/鍥炴斁鍋滄API璋冪敤锛宻treamId锛�%s", streamId));
+
+ UUID uuid = UUID.randomUUID();
+ DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
+
+ // 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
+ resultHolder.put(DeferredResultHolder.CALLBACK_CMD_STOP + uuid, result);
+
+ cmder.streamByeCmd(streamId, event -> {
+ StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
+ if (streamInfo == null) {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+ msg.setData("streamId not found");
+ resultHolder.invokeResult(msg);
+ }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 (streamId != null) {
+ JSONObject json = new JSONObject();
+ json.put("streamId", streamId);
+ 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);
+ }
+
+ // 瓒呮椂澶勭悊
+ result.onTimeout(()->{
+ logger.warn(String.format("璁惧棰勮/鍥炴斁鍋滄瓒呮椂锛宻treamId锛�%s ", streamId));
+ RequestMessage msg = new RequestMessage();
+ msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
+ msg.setData("Timeout");
+ resultHolder.invokeResult(msg);
+ });
+ return result;
+ }
+
+ /**
+ * 灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac
+ * @param streamId 娴両D
+ * @return
+ */
+ @PostMapping("/play/{streamId}/convert")
+ public ResponseEntity<String> playConvert(@PathVariable String streamId) {
+ StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
+ if (streamInfo == null) {
+ logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡缁忓仠姝�!");
+ return new ResponseEntity<String>("鏈壘鍒拌棰戞祦淇℃伅, 瑙嗛娴佸彲鑳藉凡缁忓仠姝�", HttpStatus.OK);
+ }
+ JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
+ if (!rtpInfo.getBoolean("exist")) {
+ logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡鍋滄鎺ㄦ祦!");
+ return new ResponseEntity<String>("鎺ㄦ祦淇℃伅鍦ㄦ祦濯掍綋涓笉瀛樺湪, 瑙嗛娴佸彲鑳藉凡鍋滄鎺ㄦ祦", HttpStatus.OK);
+ } else {
+ MediaServerConfig 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");
+ System.out.println(jsonObject);
+ 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 = new StreamInfo();
+ streamInfoResult.setRtmp(dstUrl);
+ streamInfoResult.setRtsp(String.format("rtsp://%s:%s/convert/%s", mediaInfo.getWanIp(), mediaInfo.getRtspPort(), streamId));
+ streamInfoResult.setStreamId(streamId);
+ streamInfoResult.setFlv(String.format("http://%s:%s/convert/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+ streamInfoResult.setWs_flv(String.format("ws://%s:%s/convert/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+ streamInfoResult.setHls(String.format("http://%s:%s/convert/%s/hls.m3u8", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+ streamInfoResult.setWs_hls(String.format("ws://%s:%s/convert/%s/hls.m3u8", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+ streamInfoResult.setFmp4(String.format("http://%s:%s/convert/%s.live.mp4", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+ streamInfoResult.setWs_fmp4(String.format("ws://%s:%s/convert/%s.live.mp4", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+ streamInfoResult.setTs(String.format("http://%s:%s/convert/%s.live.ts", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+ streamInfoResult.setWs_ts(String.format("ws://%s:%s/convert/%s.live.ts", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));
+ result.put("data", streamInfoResult);
+ }
+ }else {
+ result.put("code", 1);
+ result.put("msg", "cover fail");
+ }
+ return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
}
}
-
- @PostMapping("/play/{ssrc}/stop")
- public ResponseEntity<String> playStop(@PathVariable String ssrc){
-
- cmder.streamByeCmd(ssrc);
-
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("璁惧棰勮鍋滄API璋冪敤锛宻src锛�%s", ssrc));
+
+ /**
+ * 缁撴潫杞爜
+ * @param key
+ * @return
+ */
+ @PostMapping("/play/convert/stop/{key}")
+ public ResponseEntity<String> playConvertStop(@PathVariable String key) {
+
+ JSONObject jsonObject = zlmresTfulUtils.delFFmpegSource(key);
+ System.out.println(jsonObject);
+ 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(ssrc!=null) {
- JSONObject json = new JSONObject();
- json.put("ssrc", ssrc);
- return new ResponseEntity<String>(json.toString(),HttpStatus.OK);
- } else {
- logger.warn("璁惧棰勮鍋滄API璋冪敤澶辫触锛�");
- return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
- }
+ return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
}
}
+
--
Gitblit v1.8.0