From c1ac16bf620d09a94a0cfe184cbe1c9cb531a01b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 23 三月 2024 15:38:54 +0800
Subject: [PATCH] 优化媒体节点服务的代码结构
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 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 01fc635..a247a78 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
@@ -142,14 +142,6 @@
@PostMapping(value = "/on_server_keepalive", produces = "application/json;charset=UTF-8")
public HookResult onServerKeepalive(@RequestBody OnServerKeepaliveHookParam param) {
- taskExecutor.execute(() -> {
- List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_keepalive);
- if (subscribes != null && !subscribes.isEmpty()) {
- for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
- subscribe.response(null, param);
- }
- }
- });
try {
HookZlmServerKeepaliveEvent event = new HookZlmServerKeepaliveEvent(this);
MediaServer mediaServerItem = mediaServerService.getOne(param.getMediaServerId());
@@ -184,6 +176,7 @@
}
}
});
+ // TODO 姝ゅ閫昏緫閫傚悎杩佺Щ鍒癕ediaService涓�
if (!"rtp".equals(param.getApp())) {
Map<String, String> paramMap = urlParamToMap(param.getParams());
StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());
@@ -208,8 +201,8 @@
// TODO 鍔犲揩澶勭悊閫熷害
String mediaServerId = json.getString("mediaServerId");
- MediaServer mediaInfo = mediaServerService.getOne(mediaServerId);
- if (mediaInfo == null) {
+ MediaServer mediaServer = mediaServerService.getOne(mediaServerId);
+ if (mediaServer == null) {
return new HookResultForOnPublish(200, "success");
}
// 鎺ㄦ祦閴存潈鐨勫鐞�
@@ -257,7 +250,7 @@
taskExecutor.execute(() -> {
ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);
if (subscribe != null) {
- subscribe.response(mediaInfo, param);
+ subscribe.response(mediaServer, param);
}
});
@@ -273,7 +266,7 @@
InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream());
// 鍗曠鍙ｆā寮忎笅淇敼娴� ID
- if (!mediaInfo.isRtpEnable() && inviteInfo == null) {
+ if (!mediaServer.isRtpEnable() && inviteInfo == null) {
String ssrc = String.format("%010d", Long.parseLong(param.getStream(), 16));
inviteInfo = inviteStreamService.getInviteInfoBySSRC(ssrc);
if (inviteInfo != null) {
--
Gitblit v1.8.0