From 8c2b1ef4feae876bf714c07dd73c3821268666bf Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 14 三月 2023 18:46:01 +0800
Subject: [PATCH] 修复拉流代理 下线时状态未更改为下线 #770
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 a07a47c..7a8ac98 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
@@ -256,6 +256,7 @@
return result;
}
+
/**
* rtsp/rtmp娴佹敞鍐屾垨娉ㄩ攢鏃惰Е鍙戞浜嬩欢锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
*/
@@ -279,9 +280,12 @@
subscribe.response(mediaInfo, json);
}
}
- // 娴佹秷澶辩Щ闄edis play
+
List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
+ // TODO 閲嶆瀯姝ゅ閫昏緫
+
if (param.isRegist()) {
+ // 澶勭悊娴佹敞鍐岀殑閴存潈淇℃伅
if (param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
|| param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
|| param.getOriginType() == OriginType.RTC_PUSH.ordinal()) {
@@ -300,16 +304,15 @@
}
if ("rtsp".equals(param.getSchema())) {
+ // 鏇存柊娴佸獟浣撹礋杞戒俊鎭�
if (param.isRegist()) {
mediaServerService.addCount(param.getMediaServerId());
} else {
mediaServerService.removeCount(param.getMediaServerId());
}
- if (param.getOriginType() == OriginType.PULL.ordinal()
- || param.getOriginType() == OriginType.FFMPEG_PULL.ordinal()) {
- // 璁剧疆鎷夋祦浠ｇ悊涓婄嚎/绂荤嚎
- streamProxyService.updateStatus(param.isRegist(), param.getApp(), param.getStream());
- }
+ // 璁剧疆鎷夋祦浠ｇ悊涓婄嚎/绂荤嚎
+ streamProxyService.updateStatus(param.isRegist(), param.getApp(), param.getStream());
+
if ("rtp".equals(param.getApp()) && !param.isRegist()) {
StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(param.getStream());
if (streamInfo != null) {
--
Gitblit v1.8.0