From b699158e4336d6a00e0600e9f0058ba30533fb52 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 13 十二月 2023 14:43:42 +0800
Subject: [PATCH] 修复点播流地址修改
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 ab2d338..125e8a8 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
@@ -263,12 +263,14 @@
}
// 鍥芥爣娴�
- if ("rtp".equals(param.getApp())) {
- String ssrc = String.format("%010d", Long.parseLong(param.getStream(), 16));
- InviteInfo inviteInfo = inviteStreamService.getInviteInfoBySSRC(ssrc);
+ if ("rtp".equals(param.getApp()) ) {
+
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream());
// 鍗曠鍙ｆā寮忎笅淇敼娴� ID
- if (!mediaInfo.isRtpEnable() && inviteInfo != null) {
+ if (!mediaInfo.isRtpEnable() && inviteInfo == null) {
+ String ssrc = String.format("%010d", Long.parseLong(param.getStream(), 16));
+ inviteInfo = inviteStreamService.getInviteInfoBySSRC(ssrc);
result.setStream_replace(inviteInfo.getStream());
logger.info("[ZLM HOOK]鎺ㄦ祦閴存潈 stream: {} 鏇挎崲涓� {}", param.getStream(), inviteInfo.getStream());
}
@@ -599,7 +601,7 @@
String deviceId = s[0];
String channelId = s[1];
Device device = redisCatchStorage.getDevice(deviceId);
- if (device == null) {
+ if (device == null || !device.isOnLine()) {
defaultResult.setResult(new HookResult(ErrorCode.ERROR404.getCode(), ErrorCode.ERROR404.getMsg()));
return defaultResult;
}
--
Gitblit v1.8.0