Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复 流已经关闭后，再次调用关闭流的接口，返回超时

Browse Source
This commit is contained in:
panlinlin 2021-04-16 18:23:13 +08:00
parent e86cacee05
commit 1fe47177f0
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
View File

@ -44,5 +44,6 @@ public class VideoStreamSessionManager {
sessionMap.remove(deviceId + "_" + channelId);
SsrcUtil.releaseSsrc(ssrcMap.get(deviceId + "_" + channelId));
ssrcMap.remove(deviceId + "_" + channelId);
streamIdMap.remove(deviceId + "_" + channelId);
}
}

3
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
View File

@ -581,8 +581,9 @@ public class SIPCommander implements ISIPCommander {
if (transaction == null) {
StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
if (streamInfo != null) {
redisCatchStorage.stopPlay(streamInfo);
}
okEvent.response(null);
return;
}

4
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
View File

@ -99,8 +99,8 @@ public class PlayController {
StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
if (streamInfo == null) {
RequestMessage msg = new RequestMessage();
msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
msg.setData("streamId not found");
msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
msg.setData("点播未找到");
resultHolder.invokeResult(msg);
}else {
redisCatchStorage.stopPlay(streamInfo);