From 722f1d0ee761cee4f8a1a99da46cc799380303e8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 01 四月 2024 16:17:01 +0800
Subject: [PATCH] 国标级联-修复拉流代理播放
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 55 +++++++++++++++++++++----------------------------------
1 files changed, 21 insertions(+), 34 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 fc12859..dc24874 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
@@ -11,9 +11,9 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.media.bean.ResultForOnPublish;
-import com.genersoft.iot.vmp.media.event.*;
import com.genersoft.iot.vmp.media.event.hook.HookSubscribe;
-import com.genersoft.iot.vmp.media.event.hook.HookType;
+import com.genersoft.iot.vmp.media.event.media.*;
+import com.genersoft.iot.vmp.media.event.mediaServer.MediaSendRtpStoppedEvent;
import com.genersoft.iot.vmp.media.service.IMediaServerService;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;
import com.genersoft.iot.vmp.media.zlm.dto.ZLMServerConfig;
@@ -35,7 +35,6 @@
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
/**
@@ -144,16 +143,15 @@
@ResponseBody
@PostMapping(value = "/on_play", produces = "application/json;charset=UTF-8")
public HookResult onPlay(@RequestBody OnPlayHookParam param) {
- if (logger.isDebugEnabled()) {
- logger.debug("[ZLM HOOK] 鎾斁閴存潈锛歿}->{}", param.getMediaServerId(), param);
- }
+
Map<String, String> paramMap = urlParamToMap(param.getParams());
// 瀵逛簬鎾斁娴佽繘琛岄壌鏉�
boolean authenticateResult = mediaService.authenticatePlay(param.getApp(), param.getStream(), paramMap.get("callId"));
if (!authenticateResult) {
+ logger.info("[ZLM HOOK] 鎾斁閴存潈 澶辫触锛歿}->{}", param.getMediaServerId(), param);
return new HookResult(401, "Unauthorized");
}
-
+ logger.info("[ZLM HOOK] 鎾斁閴存潈鎴愬姛锛歿}->{}", param.getMediaServerId(), param);
return HookResult.SUCCESS();
}
@@ -172,15 +170,8 @@
String mediaServerId = json.getString("mediaServerId");
MediaServer mediaServer = mediaServerService.getOne(mediaServerId);
if (mediaServer == null) {
- return new HookResultForOnPublish(200, "success");
+ return new HookResultForOnPublish(0, "success");
}
-
- taskExecutor.execute(() -> {
- HookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);
- if (subscribe != null) {
- subscribe.response(mediaServer, param);
- }
- });
ResultForOnPublish resultForOnPublish = mediaService.authenticatePublish(mediaServer, param.getApp(), param.getStream(), param.getParams());
if (resultForOnPublish != null) {
@@ -203,6 +194,9 @@
public HookResult onStreamChanged(@RequestBody OnStreamChangedHookParam param) {
MediaServer mediaServer = mediaServerService.getOne(param.getMediaServerId());
+ if (mediaServer == null) {
+ return HookResult.SUCCESS();
+ }
if (param.isRegist()) {
logger.info("[ZLM HOOK] 娴佹敞鍐�, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
@@ -210,8 +204,8 @@
applicationEventPublisher.publishEvent(mediaArrivalEvent);
} else {
logger.info("[ZLM HOOK] 娴佹敞閿�, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
- MediaDepartureEvent mediaArrivalEvent = MediaDepartureEvent.getInstance(this, param, mediaServer);
- applicationEventPublisher.publishEvent(mediaArrivalEvent);
+ MediaDepartureEvent mediaDepartureEvent = MediaDepartureEvent.getInstance(this, param, mediaServer);
+ applicationEventPublisher.publishEvent(mediaDepartureEvent);
}
return HookResult.SUCCESS();
}
@@ -316,19 +310,12 @@
MediaServer mediaServerItem = mediaServerService.getOne(param.getMediaServerId());
if (mediaServerItem != null) {
event.setMediaServer(mediaServerItem);
+ event.setApp("rtp");
applicationEventPublisher.publishEvent(event);
}
}catch (Exception e) {
logger.info("[ZLM-HOOK-rtpServer鏀舵祦瓒呮椂] 鍙戦�侀�氱煡澶辫触 ", e);
}
- taskExecutor.execute(() -> {
- List<HookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_rtp_server_timeout);
- if (subscribes != null && !subscribes.isEmpty()) {
- for (HookSubscribe.Event subscribe : subscribes) {
- subscribe.response(null, param);
- }
- }
- });
return HookResult.SUCCESS();
}
@@ -341,16 +328,16 @@
public HookResult onRecordMp4(HttpServletRequest request, @RequestBody OnRecordMp4HookParam param) {
logger.info("[ZLM HOOK] 褰曞儚瀹屾垚浜嬩欢锛歿}->{}", param.getMediaServerId(), param.getFile_path());
- taskExecutor.execute(() -> {
- List<HookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_record_mp4);
- if (subscribes != null && !subscribes.isEmpty()) {
- for (HookSubscribe.Event subscribe : subscribes) {
- subscribe.response(null, param);
- }
+ try {
+ MediaServer mediaServerItem = mediaServerService.getOne(param.getMediaServerId());
+ if (mediaServerItem != null) {
+ MediaRecordMp4Event event = MediaRecordMp4Event.getInstance(this, param, mediaServerItem);
+ event.setMediaServer(mediaServerItem);
+ applicationEventPublisher.publishEvent(event);
}
- cloudRecordService.addRecord(param);
-
- });
+ }catch (Exception e) {
+ logger.info("[ZLM-HOOK-rtpServer鏀舵祦瓒呮椂] 鍙戦�侀�氱煡澶辫触 ", e);
+ }
return HookResult.SUCCESS();
}
--
Gitblit v1.8.0