From a77628e8759901abc3219412fc2c4aced940db28 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 28 六月 2023 14:50:46 +0800
Subject: [PATCH] 优化端口预占用，防止占用无法释放
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 10 +++++-----
1 files changed, 5 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 405fdd0..9ffb524 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
@@ -282,7 +282,7 @@
@ResponseBody
@PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")
public HookResult onStreamChanged(@RequestBody OnStreamChangedHookParam param) {
-
+ System.out.println(JSON.toJSONString(param));
if (param.isRegist()) {
logger.info("[ZLM HOOK] 娴佹敞鍐�, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
} else {
@@ -304,13 +304,11 @@
List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
// TODO 閲嶆瀯姝ゅ閫昏緫
- boolean isPush = false;
if (param.isRegist()) {
// 澶勭悊娴佹敞鍐岀殑閴存潈淇℃伅
if (param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
|| param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
|| param.getOriginType() == OriginType.RTC_PUSH.ordinal()) {
- isPush = true;
StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());
if (streamAuthorityInfo == null) {
streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param);
@@ -324,7 +322,7 @@
redisCatchStorage.removeStreamAuthorityInfo(param.getApp(), param.getStream());
}
- if ("rtsp".equals(param.getSchema())) {
+ if ("rtmp".equals(param.getSchema())) {
// 鏇存柊娴佸獟浣撹礋杞戒俊鎭�
if (param.isRegist()) {
mediaServerService.addCount(param.getMediaServerId());
@@ -363,6 +361,8 @@
StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,
param.getApp(), param.getStream(), tracks, callId);
param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));
+ // 濡傛灉鏄媺娴佷唬鐞嗕骇鐢熺殑锛屼笉闇�瑕佸啓鍏ユ帹娴�
+
redisCatchStorage.addStream(mediaInfo, type, param.getApp(), param.getStream(), param);
if (param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
|| param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
@@ -533,7 +533,7 @@
}
return ret;
}
- // 鎺ㄦ祦鍏锋湁涓诲姩鎬э紝鏆傛椂涓嶅仛澶勭悊
+ // TODO 鎺ㄦ祦鍏锋湁涓诲姩鎬э紝鏆傛椂涓嶅仛澶勭悊
// StreamPushItem streamPushItem = streamPushService.getPush(app, streamId);
// if (streamPushItem != null) {
// // TODO 鍙戦�佸仠姝�
--
Gitblit v1.8.0