guzijian / wvp-GB28181-pro · Commits

Commit 8f5bbfa5c2bf7cfc50acbdff63e1a1a38800c1e6

Authored by 648540858
1 parent 095b12eb

修复zlm上线时过期任务设置错误

Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
  View file @8f5bbfa
@@ -282,7 +282,7 @@ public class ZLMHttpHookListener { @@ -282,7 +282,7 @@ public class ZLMHttpHookListener {
282 @ResponseBody 282 @ResponseBody
283 @PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8") 283 @PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")
284 public HookResult onStreamChanged(@RequestBody OnStreamChangedHookParam param) { 284 public HookResult onStreamChanged(@RequestBody OnStreamChangedHookParam param) {
285 - 285 + System.out.println(JSON.toJSONString(param));
286 if (param.isRegist()) { 286 if (param.isRegist()) {
287 logger.info("[ZLM HOOK] 流注册, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream()); 287 logger.info("[ZLM HOOK] 流注册, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
288 } else { 288 } else {
@@ -304,13 +304,11 @@ public class ZLMHttpHookListener { @@ -304,13 +304,11 @@ public class ZLMHttpHookListener {
304 304
305 List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks(); 305 List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
306 // TODO 重构此处逻辑 306 // TODO 重构此处逻辑
307 - boolean isPush = false;  
308 if (param.isRegist()) { 307 if (param.isRegist()) {
309 // 处理流注册的鉴权信息 308 // 处理流注册的鉴权信息
310 if (param.getOriginType() == OriginType.RTMP_PUSH.ordinal() 309 if (param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
311 || param.getOriginType() == OriginType.RTSP_PUSH.ordinal() 310 || param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
312 || param.getOriginType() == OriginType.RTC_PUSH.ordinal()) { 311 || param.getOriginType() == OriginType.RTC_PUSH.ordinal()) {
313 - isPush = true;  
314 StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream()); 312 StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());
315 if (streamAuthorityInfo == null) { 313 if (streamAuthorityInfo == null) {
316 streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param); 314 streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param);
@@ -324,7 +322,7 @@ public class ZLMHttpHookListener { @@ -324,7 +322,7 @@ public class ZLMHttpHookListener {
324 redisCatchStorage.removeStreamAuthorityInfo(param.getApp(), param.getStream()); 322 redisCatchStorage.removeStreamAuthorityInfo(param.getApp(), param.getStream());
325 } 323 }
326 324
327 - if ("rtsp".equals(param.getSchema())) { 325 + if ("rtmp".equals(param.getSchema())) {
328 // 更新流媒体负载信息 326 // 更新流媒体负载信息
329 if (param.isRegist()) { 327 if (param.isRegist()) {
330 mediaServerService.addCount(param.getMediaServerId()); 328 mediaServerService.addCount(param.getMediaServerId());
@@ -363,6 +361,8 @@ public class ZLMHttpHookListener { @@ -363,6 +361,8 @@ public class ZLMHttpHookListener {
363 StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo, 361 StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,
364 param.getApp(), param.getStream(), tracks, callId); 362 param.getApp(), param.getStream(), tracks, callId);
365 param.setStreamInfo(new StreamContent(streamInfoByAppAndStream)); 363 param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));
  364 + // 如果是拉流代理产生的，不需要写入推流
  365 +
366 redisCatchStorage.addStream(mediaInfo, type, param.getApp(), param.getStream(), param); 366 redisCatchStorage.addStream(mediaInfo, type, param.getApp(), param.getStream(), param);
367 if (param.getOriginType() == OriginType.RTSP_PUSH.ordinal() 367 if (param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
368 || param.getOriginType() == OriginType.RTMP_PUSH.ordinal() 368 || param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
  View file @8f5bbfa
@@ -409,7 +409,7 @@ public class MediaServerServiceImpl implements IMediaServerService { @@ -409,7 +409,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
409 } 409 }
410 final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + serverItem.getId(); 410 final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + serverItem.getId();
411 dynamicTask.stop(zlmKeepaliveKey); 411 dynamicTask.stop(zlmKeepaliveKey);
412 - dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(serverItem), (Math.getExponent(serverItem.getHookAliveInterval()) + 5) * 1000); 412 + dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(serverItem), (serverItem.getHookAliveInterval().intValue() + 5) * 1000);
413 publisher.zlmOnlineEventPublish(serverItem.getId()); 413 publisher.zlmOnlineEventPublish(serverItem.getId());
414 414
415 logger.info("[ZLM] 连接成功 {} - {}:{} ", 415 logger.info("[ZLM] 连接成功 {} - {}:{} ",