guzijian / wvp-GB28181-pro · Commits

Commit c4d7dd9651e5dc004ab443ecd72da51c117a87c2

Authored by 648540858
2 parents fa80ba6f 8f5bbfa5

Merge branch '2.6.8' into wvp-28181-2.0

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 @c4d7dd9
... ... @@ -289,7 +289,7 @@ public class ZLMHttpHookListener {
289 289 @ResponseBody
290 290 @PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")
291 291 public HookResult onStreamChanged(@RequestBody OnStreamChangedHookParam param) {
292   -
  292 + System.out.println(JSON.toJSONString(param));
293 293 if (param.isRegist()) {
294 294 logger.info("[ZLM HOOK] 流注册, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
295 295 } else {
... ... @@ -311,13 +311,11 @@ public class ZLMHttpHookListener {
311 311  
312 312 List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
313 313 // TODO 重构此处逻辑
314   - boolean isPush = false;
315 314 if (param.isRegist()) {
316 315 // 处理流注册的鉴权信息
317 316 if (param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
318 317 || param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
319 318 || param.getOriginType() == OriginType.RTC_PUSH.ordinal()) {
320   - isPush = true;
321 319 StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());
322 320 if (streamAuthorityInfo == null) {
323 321 streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param);
... ... @@ -331,7 +329,7 @@ public class ZLMHttpHookListener {
331 329 redisCatchStorage.removeStreamAuthorityInfo(param.getApp(), param.getStream());
332 330 }
333 331  
334   - if ("rtsp".equals(param.getSchema())) {
  332 + if ("rtmp".equals(param.getSchema())) {
335 333 // 更新流媒体负载信息
336 334 if (param.isRegist()) {
337 335 mediaServerService.addCount(param.getMediaServerId());
... ... @@ -363,6 +361,8 @@ public class ZLMHttpHookListener {
363 361 StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,
364 362 param.getApp(), param.getStream(), tracks, callId);
365 363 param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));
  364 + // 如果是拉流代理产生的，不需要写入推流
  365 +
366 366 redisCatchStorage.addStream(mediaInfo, type, param.getApp(), param.getStream(), param);
367 367 if (param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
368 368 || param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
... ...
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
  View file @c4d7dd9
... ... @@ -418,7 +418,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
418 418 }
419 419 final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + serverItem.getId();
420 420 dynamicTask.stop(zlmKeepaliveKey);
421   - dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(serverItem), (Math.getExponent(serverItem.getHookAliveInterval()) + 5) * 1000);
  421 + dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(serverItem), (serverItem.getHookAliveInterval().intValue() + 5) * 1000);
422 422 publisher.zlmOnlineEventPublish(serverItem.getId());
423 423  
424 424 logger.info("[ZLM] 连接成功 {} - {}:{} ",
... ...