guzijian / wvp-GB28181-pro · Commits

Commit c5f2aba9b20089f184ce175b58a33a881ea9e0b1

Authored by panlinlin
1 parent 2dacd7d7

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

Inline Side-by-side
Showing 3 changed files with 5 additions and 3 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
  View file @c5f2aba
... ... @@ -44,5 +44,6 @@ public class VideoStreamSessionManager {
44 44 sessionMap.remove(deviceId + "_" + channelId);
45 45 SsrcUtil.releaseSsrc(ssrcMap.get(deviceId + "_" + channelId));
46 46 ssrcMap.remove(deviceId + "_" + channelId);
  47 + streamIdMap.remove(deviceId + "_" + channelId);
47 48 }
48 49 }
... ...
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @c5f2aba
... ... @@ -581,8 +581,9 @@ public class SIPCommander implements ISIPCommander {
581 581 if (transaction == null) {
582 582 StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
583 583 if (streamInfo != null) {
584   -
  584 + redisCatchStorage.stopPlay(streamInfo);
585 585 }
  586 + okEvent.response(null);
586 587 return;
587 588 }
588 589  
... ...
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
  View file @c5f2aba
... ... @@ -99,8 +99,8 @@ public class PlayController {
99 99 StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
100 100 if (streamInfo == null) {
101 101 RequestMessage msg = new RequestMessage();
102   - msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
103   - msg.setData("streamId not found");
  102 + msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
  103 + msg.setData("点播未找到");
104 104 resultHolder.invokeResult(msg);
105 105 }else {
106 106 redisCatchStorage.stopPlay(streamInfo);
... ...