From 3dc1e0368e63a40131afb10ab0c7e26f651d220b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 04 三月 2022 15:59:29 +0800
Subject: [PATCH] 修复合并分支造成的bug
---
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index 9c87a0a..778bd67 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -17,9 +17,11 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.bean.PlayBackCallback;
+import com.genersoft.iot.vmp.service.bean.PlayBackResult;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
import com.genersoft.iot.vmp.service.IMediaService;
@@ -52,6 +54,9 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private RedisUtil redis;
@Autowired
private DeferredResultHolder resultHolder;
@@ -112,7 +117,7 @@
// 鐐规挱瓒呮椂鍥炲BYE
cmder.streamByeCmd(device.getDeviceId(), channelId, streamInfo.getStream());
// 閲婃斁rtpserver
- mediaServerService.closeRTPServer(playResult.getDevice(), channelId, streamInfo.getStream());
+ mediaServerService.closeRTPServer(playResult.getDevice().getDeviceId(), channelId, streamInfo.getStream());
// 鍥炲涔嬪墠鎵�鏈夌殑鐐规挱璇锋眰
resultHolder.invokeAllResult(msg);
// TODO 閲婃斁ssrc
@@ -121,7 +126,6 @@
// 鐐规挱缁撴潫鏃惰皟鐢ㄦ埅鍥炬帴鍙�
try {
String classPath = ResourceUtils.getURL("classpath:").getPath();
- // System.out.println(classPath);
// 鍏煎鎵撳寘涓簀ar鐨刢lass璺緞
if(classPath.contains("jar")) {
classPath = classPath.substring(0, classPath.lastIndexOf("."));
@@ -170,7 +174,10 @@
WVPResult wvpResult = new WVPResult();
wvpResult.setCode(-1);
// 鐐规挱杩斿洖sip閿欒
- mediaServerService.closeRTPServer(playResult.getDevice(), channelId, ssrcInfo.getStream());
+ mediaServerService.closeRTPServer(playResult.getDevice().getDeviceId(), channelId, ssrcInfo.getStream());
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem, ssrcInfo.getSsrc());
+ streamSession.remove(deviceId, channelId, ssrcInfo.getStream());
wvpResult.setMsg(String.format("鐐规挱澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
msg.setData(wvpResult);
resultHolder.invokeAllResult(msg);
@@ -219,7 +226,10 @@
logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
onPublishHandlerForPlay(mediaServerItemInuse, response, deviceId, channelId, uuid);
}, (event) -> {
- mediaServerService.closeRTPServer(playResult.getDevice(), channelId, ssrcInfo.getStream());
+ mediaServerService.closeRTPServer(playResult.getDevice().getDeviceId(), channelId, ssrcInfo.getStream());
+ // 閲婃斁ssrc
+ mediaServerService.releaseSsrc(mediaServerItem, ssrcInfo.getSsrc());
+ streamSession.remove(deviceId, channelId, ssrcInfo.getStream());
WVPResult wvpResult = new WVPResult();
wvpResult.setCode(-1);
wvpResult.setMsg(String.format("鐐规挱澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
@@ -233,11 +243,11 @@
}
@Override
- public void onPublishHandlerForPlay(MediaServerItem mediaServerItem, JSONObject resonse, String deviceId, String channelId, String uuid) {
+ public void onPublishHandlerForPlay(MediaServerItem mediaServerItem, JSONObject response, String deviceId, String channelId, String uuid) {
RequestMessage msg = new RequestMessage();
msg.setId(uuid);
msg.setKey(DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId);
- StreamInfo streamInfo = onPublishHandler(mediaServerItem, resonse, deviceId, channelId);
+ StreamInfo streamInfo = onPublishHandler(mediaServerItem, response, deviceId, channelId);
if (streamInfo != null) {
DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
if (deviceChannel != null) {
@@ -295,9 +305,12 @@
RequestMessage msg = new RequestMessage();
msg.setId(uuid);
msg.setKey(key);
+ PlayBackResult<RequestMessage> playBackResult = new PlayBackResult<>();
result.onTimeout(()->{
msg.setData("鍥炴斁瓒呮椂");
- callback.call(msg);
+ playBackResult.setCode(-1);
+ playBackResult.setData(msg);
+ callback.call(playBackResult);
});
cmder.playbackStreamCmd(newMediaServerItem, ssrcInfo, device, channelId, startTime, endTime, (MediaServerItem mediaServerItem, JSONObject response) -> {
logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
@@ -305,15 +318,25 @@
if (streamInfo == null) {
logger.warn("璁惧鍥炴斁API璋冪敤澶辫触锛�");
msg.setData("璁惧鍥炴斁API璋冪敤澶辫触锛�");
- callback.call(msg);
+ playBackResult.setCode(-1);
+ playBackResult.setData(msg);
+ callback.call(playBackResult);
return;
}
redisCatchStorage.startPlayback(streamInfo);
msg.setData(JSON.toJSONString(streamInfo));
- callback.call(msg);
+ playBackResult.setCode(0);
+ playBackResult.setData(msg);
+ playBackResult.setMediaServerItem(mediaServerItem);
+ playBackResult.setResponse(response);
+ callback.call(playBackResult);
}, event -> {
msg.setData(String.format("鍥炴斁澶辫触锛� 閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
- callback.call(msg);
+ playBackResult.setCode(-1);
+ playBackResult.setData(msg);
+ playBackResult.setEvent(event);
+ callback.call(playBackResult);
+ streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
});
return result;
}
--
Gitblit v1.8.0