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

修复拉流代理 下线时状态未更改为下线 #770

pull/783/head
648540858 2023-03-14 18:46:01 +08:00
parent 943f95ba8c
commit 8c2b1ef4fe
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,6 +256,7 @@ public class ZLMHttpHookListener {
return result; return result;
} }
/** /**
* rtsp/rtmp流注册或注销时触发此事件；此事件对回复不敏感。 * rtsp/rtmp流注册或注销时触发此事件；此事件对回复不敏感。
*/ */
@ -279,9 +280,12 @@ public class ZLMHttpHookListener {
subscribe.response(mediaInfo, json); subscribe.response(mediaInfo, json);
} }
} }
// 流消失移除redis play
List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks(); List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
// TODO 重构此处逻辑
if (param.isRegist()) { if (param.isRegist()) {
// 处理流注册的鉴权信息
if (param.getOriginType() == OriginType.RTMP_PUSH.ordinal() if (param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
|| param.getOriginType() == OriginType.RTSP_PUSH.ordinal() || param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
|| param.getOriginType() == OriginType.RTC_PUSH.ordinal()) { || param.getOriginType() == OriginType.RTC_PUSH.ordinal()) {
@ -300,16 +304,15 @@ public class ZLMHttpHookListener {
} }
if ("rtsp".equals(param.getSchema())) { if ("rtsp".equals(param.getSchema())) {
// 更新流媒体负载信息
if (param.isRegist()) { if (param.isRegist()) {
mediaServerService.addCount(param.getMediaServerId()); mediaServerService.addCount(param.getMediaServerId());
} else { } else {
mediaServerService.removeCount(param.getMediaServerId()); mediaServerService.removeCount(param.getMediaServerId());
} }
if (param.getOriginType() == OriginType.PULL.ordinal() // 设置拉流代理上线/离线
|| param.getOriginType() == OriginType.FFMPEG_PULL.ordinal()) { streamProxyService.updateStatus(param.isRegist(), param.getApp(), param.getStream());
// 设置拉流代理上线/离线
streamProxyService.updateStatus(param.isRegist(), param.getApp(), param.getStream());
}
if ("rtp".equals(param.getApp()) && !param.isRegist()) { if ("rtp".equals(param.getApp()) && !param.isRegist()) {
StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(param.getStream()); StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(param.getStream());
if (streamInfo != null) { if (streamInfo != null) {