From b957ab61c7d7f54716f81f4cd9474238fd110e1d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 26 七月 2022 11:43:56 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 055cccb..11dd817 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -240,6 +240,8 @@
if (mediaInfo != null) {
assistRESTfulUtils.addStreamCallInfo(mediaInfo, param.getApp(), param.getStream(), callId, null);
}
+ }else {
+ zlmMediaListManager.sendStreamEvent(param.getApp(),param.getStream(), param.getMediaServerId());
}
ret.put("code", 0);
@@ -461,7 +463,6 @@
StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaServerItem,
app, stream, tracks, streamAuthorityInfo.getCallId());
item.setStreamInfo(streamInfoByAppAndStream);
- item.setSeverId(userSetting.getServerId());
redisCatchStorage.addStream(mediaServerItem, type, app, stream, item);
if (item.getOriginType() == OriginType.RTSP_PUSH.ordinal()
|| item.getOriginType() == OriginType.RTMP_PUSH.ordinal()
@@ -469,20 +470,6 @@
item.setSeverId(userSetting.getServerId());
zlmMediaListManager.addPush(item);
}
-
-// List<GbStream> gbStreams = new ArrayList<>();
-// if (streamPushItem == null || streamPushItem.getGbId() == null) {
-// GbStream gbStream = storager.getGbStream(app, streamId);
-// gbStreams.add(gbStream);
-// }else {
-// if (streamPushItem.getGbId() != null) {
-// gbStreams.add(streamPushItem);
-// }
-// }
-// if (gbStreams.size() > 0) {
-// eventPublisher.catalogEventPublishForStream(null, gbStreams, CatalogEvent.ON);
-// }
-
}else {
// 鍏煎娴佹敞閿�鏃剁被鍨嬩粠redis璁板綍鑾峰彇
MediaItem mediaItem = redisCatchStorage.getStreamInfo(app, stream, mediaServerId);
--
Gitblit v1.8.0