Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

临时提交

2.7.0
648540858 2024-04-18 18:19:27 +08:00
parent 38ce529dd2
commit 73559cc6b3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
View File

@ -518,13 +518,13 @@ public class ZLMHttpHookListener {
} }
if (sendRtpItem.getApp().equals(param.getApp())) { if (sendRtpItem.getApp().equals(param.getApp())) {
// 在hook收到这个消息，说明发流一定是本级完成的。 // 在hook收到这个消息，说明发流一定是本级完成的。
redisCatchStorage.deleteSendRTPServer(sendRtpItem);
ssrcFactory.releaseSsrc(sendRtpItem.getMediaServerId(), sendRtpItem.getSsrc()); ssrcFactory.releaseSsrc(sendRtpItem.getMediaServerId(), sendRtpItem.getSsrc());
ParentPlatform platform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId()); ParentPlatform platform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());
Device device = deviceService.getDevice(sendRtpItem.getPlatformId()); Device device = deviceService.getDevice(sendRtpItem.getPlatformId());
try { try {
if (platform != null) { if (platform != null) {
commanderFroPlatform.streamByeCmd(platform, sendRtpItem); commanderFroPlatform.streamByeCmd(platform, sendRtpItem);
redisCatchStorage.deleteSendRTPServer(sendRtpItem);
redisCatchStorage.sendPlatformStopPlayMsg(sendRtpItem, platform); redisCatchStorage.sendPlatformStopPlayMsg(sendRtpItem, platform);
} else if (device != null) { } else if (device != null) {
cmder.streamByeCmd(device, sendRtpItem.getChannelId(), param.getStream(), sendRtpItem.getCallId()); cmder.streamByeCmd(device, sendRtpItem.getChannelId(), param.getStream(), sendRtpItem.getCallId());

2
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
View File

@ -271,10 +271,10 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
+ channelId + "_" + channelId + "_"
+ streamId + "_" + streamId + "_"
+ callId; + callId;
logger.info("[删除 redis的SendRTP]： {}", key);
List<Object> scan = RedisUtil.scan(redisTemplate, key); List<Object> scan = RedisUtil.scan(redisTemplate, key);
if (scan.size() > 0) { if (scan.size() > 0) {
for (Object keyStr : scan) { for (Object keyStr : scan) {
logger.info("[删除 redis的SendRTP]： {}", keyStr.toString());
redisTemplate.delete(keyStr); redisTemplate.delete(keyStr);
} }
} }