From b5c9de775db8078e37f276640854d5850b3b1335 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 21 十二月 2020 16:01:47 +0800
Subject: [PATCH] 补充漏掉的文件
---
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 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 e741b5a..ce907e8 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
@@ -7,6 +7,7 @@
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.vmanager.service.IPlayService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,14 +63,7 @@
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);
- });
+
// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid, result);
@@ -80,7 +74,7 @@
playService.onPublishHandlerForPlay(response, deviceId, channelId, uuid.toString());
});
} else {
- String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
+ String streamId = streamInfo.getStreamId();
JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
if (rtpInfo.getBoolean("exist")) {
RequestMessage msg = new RequestMessage();
@@ -89,31 +83,41 @@
resultHolder.invokeResult(msg);
} else {
storager.stopPlay(streamInfo);
- // TODO playStreamCmd 瓒呮椂澶勭悊
cmder.playStreamCmd(device, channelId, (JSONObject response) -> {
logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
playService.onPublishHandlerForPlay(response, deviceId, channelId, uuid.toString());
});
}
}
+
+ // 瓒呮椂澶勭悊
+ 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/{ssrc}/stop")
- public ResponseEntity<String> playStop(@PathVariable String ssrc) {
+ @PostMapping("/play/{streamId}/stop")
+ public ResponseEntity<String> playStop(@PathVariable String streamId) {
- cmder.streamByeCmd(ssrc);
- StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
+ cmder.streamByeCmd(streamId);
+ StreamInfo streamInfo = storager.queryPlayByStreamId(streamId);
if (streamInfo == null)
- return new ResponseEntity<String>("ssrc not found", HttpStatus.OK);
+ return new ResponseEntity<String>("streamId not found", HttpStatus.OK);
storager.stopPlay(streamInfo);
if (logger.isDebugEnabled()) {
- logger.debug(String.format("璁惧棰勮鍋滄API璋冪敤锛宻src锛�%s", ssrc));
+ logger.debug(String.format("璁惧棰勮鍋滄API璋冪敤锛宻treamId锛�%s", streamId));
}
- if (ssrc != null) {
+ if (streamId != null) {
JSONObject json = new JSONObject();
- json.put("ssrc", ssrc);
+ json.put("streamId", streamId);
return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
} else {
logger.warn("璁惧棰勮鍋滄API璋冪敤澶辫触锛�");
@@ -123,17 +127,16 @@
/**
* 灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac
- * @param ssrc
+ * @param streamId 娴両D
* @return
*/
- @PostMapping("/play/{ssrc}/convert")
- public ResponseEntity<String> playConvert(@PathVariable String ssrc) {
- StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
+ @PostMapping("/play/{streamId}/convert")
+ public ResponseEntity<String> playConvert(@PathVariable String streamId) {
+ StreamInfo streamInfo = storager.queryPlayByStreamId(streamId);
if (streamInfo == null) {
logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡缁忓仠姝�!");
return new ResponseEntity<String>("鏈壘鍒拌棰戞祦淇℃伅, 瑙嗛娴佸彲鑳藉凡缁忓仠姝�", HttpStatus.OK);
}
- String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
if (!rtpInfo.getBoolean("exist")) {
logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡鍋滄鎺ㄦ祦!");
--
Gitblit v1.8.0