From 050882d6a614f87d33d90bc5b344c774d9f6e71d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 20 六月 2024 22:35:48 +0800
Subject: [PATCH] 修复推流时存入推流数据的问题
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 73f20bf..a676fb9 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -376,17 +376,21 @@
}
redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);
- Map<String, String> params = MediaServerUtils.urlParamToMap(param.getParams());
- param.setParamMap(params);
- StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,
- param.getApp(), param.getStream(), tracks, params.get("callId"));
- param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));
+ if (!"broadcast".equals(param.getApp()) && !"talk".equals(param.getApp())) {
+ Map<String, String> params = MediaServerUtils.urlParamToMap(param.getParams());
+ param.setParamMap(params);
+ StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,
+ param.getApp(), param.getStream(), tracks, params.get("callId"));
+ param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));
- param.setSeverId(userSetting.getServerId());
- streamPushService.updatePush(param);
- // 鍐椾綑鏁版嵁锛岃嚜宸辩郴缁熶腑鑷敤
- redisCatchStorage.addPushListItem(param.getApp(), param.getStream(), param);
+ param.setSeverId(userSetting.getServerId());
+ streamPushService.updatePush(param);
+ // 鍐椾綑鏁版嵁锛岃嚜宸辩郴缁熶腑鑷敤
+ redisCatchStorage.addPushListItem(param.getApp(), param.getStream(), param);
+ }
}
+ }else {
+ redisCatchStorage.removePushListItem(param.getApp(), param.getStream(), param.getMediaServerId());
}
// TODO 淇敼涓虹涓�涓负鍑� 鍚庣画涓嶅啀澶勭悊
if ("rtsp".equals(param.getSchema())) {
--
Gitblit v1.8.0