panlinlin
2021-04-16 c5f2aba9b20089f184ce175b58a33a881ea9e0b1
修复 流已经关闭后,再次调用关闭流的接口,返回超时
3个文件已修改
8 ■■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
@@ -44,5 +44,6 @@
        sessionMap.remove(deviceId + "_" + channelId);
        SsrcUtil.releaseSsrc(ssrcMap.get(deviceId + "_" + channelId));
        ssrcMap.remove(deviceId + "_" + channelId);
        streamIdMap.remove(deviceId + "_" + channelId);
    }
}
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -581,8 +581,9 @@
            if (transaction == null) {
                StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
                if (streamInfo != null) {
                    redisCatchStorage.stopPlay(streamInfo);
                }
                okEvent.response(null);
                return;
            }
            
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -99,8 +99,8 @@
            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);