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:31:37 +08:00
parent 73559cc6b3
commit 94436de3e1
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
View File

@ -780,7 +780,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
} }
}, userSetting.getPlatformPlayTimeout()); }, userSetting.getPlatformPlayTimeout());
// //
redisRpcService.waitePushStreamOnline(sendRtpItem, (sendRtpItemKey) -> { long key = redisRpcService.waitePushStreamOnline(sendRtpItem, (sendRtpItemKey) -> {
dynamicTask.stop(sendRtpItem.getCallId()); dynamicTask.stop(sendRtpItem.getCallId());
if (sendRtpItemKey == null) { if (sendRtpItemKey == null) {
logger.warn("[级联点播] 等待推流得到结果未空： {}/{}", sendRtpItem.getApp(), sendRtpItem.getStream()); logger.warn("[级联点播] 等待推流得到结果未空： {}/{}", sendRtpItem.getApp(), sendRtpItem.getStream());
@ -835,6 +835,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
if (response.getCode() != 0) { if (response.getCode() != 0) {
dynamicTask.stop(sendRtpItem.getCallId()); dynamicTask.stop(sendRtpItem.getCallId());
redisRpcService.stopWaitePushStreamOnline(sendRtpItem.getRedisKey(), sendRtpItem); redisRpcService.stopWaitePushStreamOnline(sendRtpItem.getRedisKey(), sendRtpItem);
redisRpcService.removeCallback(key);
try { try {
responseAck(request, Response.TEMPORARILY_UNAVAILABLE, response.getMsg()); responseAck(request, Response.TEMPORARILY_UNAVAILABLE, response.getMsg());
} catch (SipException | InvalidArgumentException | ParseException e) { } catch (SipException | InvalidArgumentException | ParseException e) {

3
src/main/java/com/genersoft/iot/vmp/service/redisMsg/IRedisRpcService.java
View File

@ -12,10 +12,11 @@ public interface IRedisRpcService {
WVPResult stopSendRtp(String sendRtpItemKey); WVPResult stopSendRtp(String sendRtpItemKey);
void waitePushStreamOnline(SendRtpItem sendRtpItem, CommonCallback<String> callback); long waitePushStreamOnline(SendRtpItem sendRtpItem, CommonCallback<String> callback);
void stopWaitePushStreamOnline(String sendRtpItemKey, SendRtpItem sendRtpItem); void stopWaitePushStreamOnline(String sendRtpItemKey, SendRtpItem sendRtpItem);
void rtpSendStopped(String sendRtpItemKey); void rtpSendStopped(String sendRtpItemKey);
void removeCallback(long key);
} }

9
src/main/java/com/genersoft/iot/vmp/service/redisMsg/service/RedisRpcServiceImpl.java
View File

@ -84,7 +84,7 @@ public class RedisRpcServiceImpl implements IRedisRpcService {
} }
@Override @Override
public void waitePushStreamOnline(SendRtpItem sendRtpItem, CommonCallback<String> callback) { public long waitePushStreamOnline(SendRtpItem sendRtpItem, CommonCallback<String> callback) {
logger.info("[请求所有WVP监听流上线] {}/{}", sendRtpItem.getApp(), sendRtpItem.getStream()); logger.info("[请求所有WVP监听流上线] {}/{}", sendRtpItem.getApp(), sendRtpItem.getStream());
// 监听流上线。 流上线直接发送sendRtpItem消息给实际的信令处理者 // 监听流上线。 流上线直接发送sendRtpItem消息给实际的信令处理者
HookSubscribeForStreamChange hook = HookSubscribeFactory.on_stream_changed( HookSubscribeForStreamChange hook = HookSubscribeFactory.on_stream_changed(
@ -122,7 +122,7 @@ public class RedisRpcServiceImpl implements IRedisRpcService {
} }
hookSubscribe.removeSubscribe(hook); hookSubscribe.removeSubscribe(hook);
}); });
return request.getSn();
} }
@Override @Override
@ -147,4 +147,9 @@ public class RedisRpcServiceImpl implements IRedisRpcService {
request.setToId(sendRtpItem.getServerId()); request.setToId(sendRtpItem.getServerId());
redisRpcConfig.request(request, 10); redisRpcConfig.request(request, 10);
} }
@Override
public void removeCallback(long key) {
redisRpcConfig.removeCallback(key);
}
} }