From 2d82d1b8eec67df9195b7ebc4b4318a7cdcc1f7f Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期三, 03 三月 2021 10:30:06 +0800
Subject: [PATCH] 修复ssrc释放失败的问题
---
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 74 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 20 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 eba40bb..08e5cc4 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,18 +1,16 @@
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.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;
@@ -29,7 +27,6 @@
import org.springframework.web.context.request.async.DeferredResult;
import javax.sip.message.Response;
-import java.text.DecimalFormat;
import java.util.UUID;
@CrossOrigin
@@ -46,6 +43,9 @@
private IVideoManagerStorager storager;
@Autowired
+ private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
@Autowired
@@ -60,7 +60,7 @@
Device device = storager.queryVideoDevice(deviceId);
- StreamInfo streamInfo = storager.queryPlayByDevice(deviceId, channelId);
+ StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
UUID uuid = UUID.randomUUID();
DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
@@ -89,7 +89,8 @@
msg.setData(JSON.toJSONString(streamInfo));
resultHolder.invokeResult(msg);
} else {
- storager.stopPlay(streamInfo);
+ 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());
@@ -117,25 +118,58 @@
}
@PostMapping("/play/{streamId}/stop")
- public ResponseEntity<String> playStop(@PathVariable String streamId) {
+ public DeferredResult<ResponseEntity<String>> playStop(@PathVariable String streamId) {
- cmder.streamByeCmd(streamId);
- StreamInfo streamInfo = storager.queryPlayByStreamId(streamId);
- if (streamInfo == null)
- return new ResponseEntity<String>("streamId not found", HttpStatus.OK);
- storager.stopPlay(streamInfo);
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("璁惧棰勮鍋滄API璋冪敤锛宻treamId锛�%s", 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);
- return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
+ RequestMessage msg = new RequestMessage();
+ msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
+ msg.setData(json.toString());
+ resultHolder.invokeResult(msg);
} else {
- logger.warn("璁惧棰勮鍋滄API璋冪敤澶辫触锛�");
- return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+ 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;
}
/**
@@ -145,7 +179,7 @@
*/
@PostMapping("/play/{streamId}/convert")
public ResponseEntity<String> playConvert(@PathVariable String streamId) {
- StreamInfo streamInfo = storager.queryPlayByStreamId(streamId);
+ StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
if (streamInfo == null) {
logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡缁忓仠姝�!");
return new ResponseEntity<String>("鏈壘鍒拌棰戞祦淇℃伅, 瑙嗛娴佸彲鑳藉凡缁忓仠姝�", HttpStatus.OK);
@@ -155,7 +189,7 @@
logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡鍋滄鎺ㄦ祦!");
return new ResponseEntity<String>("鎺ㄦ祦淇℃伅鍦ㄦ祦濯掍綋涓笉瀛樺湪, 瑙嗛娴佸彲鑳藉凡鍋滄鎺ㄦ祦", HttpStatus.OK);
} else {
- MediaServerConfig mediaInfo = storager.getMediaInfo();
+ 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);
--
Gitblit v1.8.0