From 2c89fae49a7655105b4e9e0138155485e6ba83b2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 23 五月 2024 17:32:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/2.7.1'
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 585 ++++++++-------------------------------------------------
1 files changed, 86 insertions(+), 499 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 ca52619..8b8389e 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
@@ -2,37 +2,30 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.common.InviteInfo;
-import com.genersoft.iot.vmp.common.InviteSessionType;
-import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.UserSetting;
-import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
-import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
-import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;
import com.genersoft.iot.vmp.gb28181.session.SSRCFactory;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
-import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
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.MediaInfo;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.media.bean.ResultForOnPublish;
-import com.genersoft.iot.vmp.media.event.MediaArrivalEvent;
-import com.genersoft.iot.vmp.media.event.MediaDepartureEvent;
+import com.genersoft.iot.vmp.media.event.hook.HookSubscribe;
+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.*;
+import com.genersoft.iot.vmp.media.zlm.dto.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.dto.hook.*;
import com.genersoft.iot.vmp.media.zlm.event.HookZlmServerKeepaliveEvent;
import com.genersoft.iot.vmp.media.zlm.event.HookZlmServerStartEvent;
import com.genersoft.iot.vmp.service.*;
-import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
-import com.genersoft.iot.vmp.service.bean.SSRCInfo;
+import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.utils.MediaServerUtils;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.OtherPsSendInfo;
import com.genersoft.iot.vmp.vmanager.bean.OtherRtpSendInfo;
@@ -46,16 +39,14 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.async.DeferredResult;
import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
import java.text.ParseException;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
/**
* @description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉
@@ -86,6 +77,10 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private IRedisRpcService redisRpcService;
+
@Autowired
private IInviteStreamService inviteStreamService;
@@ -108,10 +103,7 @@
private EventPublisher eventPublisher;
@Autowired
- private ZLMMediaListManager zlmMediaListManager;
-
- @Autowired
- private ZlmHttpHookSubscribe subscribe;
+ private HookSubscribe subscribe;
@Autowired
private UserSetting userSetting;
@@ -138,6 +130,9 @@
@Autowired
private ApplicationEventPublisher applicationEventPublisher;
+ @Autowired
+ private IStreamPushService streamPushService;
+
/**
* 鏈嶅姟鍣ㄥ畾鏃朵笂鎶ユ椂闂达紝涓婃姤闂撮殧鍙厤缃紝榛樿10s涓婃姤涓�娆�
*/
@@ -163,16 +158,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();
}
@@ -191,15 +185,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(() -> {
- ZlmHttpHookSubscribe.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) {
@@ -222,219 +209,26 @@
public HookResult onStreamChanged(@RequestBody OnStreamChangedHookParam param) {
MediaServer mediaServer = mediaServerService.getOne(param.getMediaServerId());
-
- if (param.isRegist()) {
- logger.info("[ZLM HOOK] 娴佹敞鍐�, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
- MediaArrivalEvent mediaArrivalEvent = MediaArrivalEvent.getInstance(this, param, mediaServer);
- 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);
+ if (mediaServer == null) {
+ return HookResult.SUCCESS();
}
- return HookResult.SUCCESS();
-
-
-
- JSONObject json = (JSONObject) JSON.toJSON(param);
- taskExecutor.execute(() -> {
- ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_stream_changed, json);
- MediaServer mediaInfo = mediaServerService.getOne(param.getMediaServerId());
- if (mediaInfo == null) {
- logger.info("[ZLM HOOK] 娴佸彉鍖栨湭鎵惧埌ZLM, {}", param.getMediaServerId());
- return;
- }
- if (subscribe != null) {
- subscribe.response(mediaInfo, param);
- }
-
- // TODO 閲嶆瀯姝ゅ閫昏緫
+ if (!ObjectUtils.isEmpty(mediaServer.getTranscodeSuffix())
+ && !"null".equalsIgnoreCase(mediaServer.getTranscodeSuffix())
+ && param.getStream().endsWith(mediaServer.getTranscodeSuffix()) ) {
+ return;
+ }
+ if (param.getSchema().equalsIgnoreCase("rtsp")) {
if (param.isRegist()) {
- // 澶勭悊娴佹敞鍐岀殑閴存潈淇℃伅锛� 娴佹敞閿�杩欓噷涓嶅啀鍒犻櫎閴存潈淇℃伅锛屼笅娆℃潵浜嗘柊鐨勯壌鏉冧俊鎭細瀵瑰氨鐨勮繘琛岃鐩�
- if (param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
- || param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
- || param.getOriginType() == OriginType.RTC_PUSH.ordinal()) {
- StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());
- if (streamAuthorityInfo == null) {
- streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param);
- } else {
- streamAuthorityInfo.setOriginType(param.getOriginType());
- streamAuthorityInfo.setOriginTypeStr(param.getOriginTypeStr());
- }
- redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);
- }
+ logger.info("[ZLM HOOK] 娴佹敞鍐�, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
+ MediaArrivalEvent mediaArrivalEvent = MediaArrivalEvent.getInstance(this, param, mediaServer);
+ applicationEventPublisher.publishEvent(mediaArrivalEvent);
+ } else {
+ logger.info("[ZLM HOOK] 娴佹敞閿�, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
+ MediaDepartureEvent mediaDepartureEvent = MediaDepartureEvent.getInstance(this, param, mediaServer);
+ applicationEventPublisher.publishEvent(mediaDepartureEvent);
}
- if ("rtsp".equals(param.getSchema())) {
- logger.info("娴佸彉鍖栵細娉ㄥ唽->{}, app->{}, stream->{}", param.isRegist(), param.getApp(), param.getStream());
- if (param.isRegist()) {
- mediaServerService.addCount(param.getMediaServerId());
- } else {
- mediaServerService.removeCount(param.getMediaServerId());
- }
+ }
- int updateStatusResult = streamProxyService.updateStatus(param.isRegist(), param.getApp(), param.getStream());
- if (updateStatusResult > 0) {
-
- }
-
- if ("rtp".equals(param.getApp()) && !param.isRegist()) {
- InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream());
- if (inviteInfo != null && (inviteInfo.getType() == InviteSessionType.PLAY || inviteInfo.getType() == InviteSessionType.PLAYBACK)) {
- inviteStreamService.removeInviteInfo(inviteInfo);
- storager.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());
- }
- } else if ("broadcast".equals(param.getApp())) {
- // 璇煶瀵硅鎺ㄦ祦 stream闇�瑕佹弧瓒虫牸寮廳eviceId_channelId
- if (param.getStream().indexOf("_") > 0) {
- String[] streamArray = param.getStream().split("_");
- if (streamArray.length == 2) {
- String deviceId = streamArray[0];
- String channelId = streamArray[1];
- Device device = deviceService.getDevice(deviceId);
- if (device != null) {
- if (param.isRegist()) {
- if (audioBroadcastManager.exit(deviceId, channelId)) {
- playService.stopAudioBroadcast(deviceId, channelId);
- }
- // 寮�鍚闊冲璁查�氶亾
- try {
- playService.audioBroadcastCmd(device, channelId, mediaInfo, param.getApp(), param.getStream(), 60, false, (msg) -> {
- logger.info("[璇煶瀵硅] 閫氶亾寤虹珛鎴愬姛, device: {}, channel: {}", deviceId, channelId);
- });
- } catch (InvalidArgumentException | ParseException | SipException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 璇煶瀵硅: {}", e.getMessage());
- }
- } else {
- // 娴佹敞閿�
- playService.stopAudioBroadcast(deviceId, channelId);
- }
- } else {
- logger.info("[璇煶瀵硅] 鏈壘鍒拌澶囷細{}", deviceId);
- }
- }
- }
- } else if ("talk".equals(param.getApp())) {
- // 璇煶瀵硅鎺ㄦ祦 stream闇�瑕佹弧瓒虫牸寮廳eviceId_channelId
- if (param.getStream().indexOf("_") > 0) {
- String[] streamArray = param.getStream().split("_");
- if (streamArray.length == 2) {
- String deviceId = streamArray[0];
- String channelId = streamArray[1];
- Device device = deviceService.getDevice(deviceId);
- if (device != null) {
- if (param.isRegist()) {
- if (audioBroadcastManager.exit(deviceId, channelId)) {
- playService.stopAudioBroadcast(deviceId, channelId);
- }
- // 寮�鍚闊冲璁查�氶亾
- playService.talkCmd(device, channelId, mediaInfo, param.getStream(), (msg) -> {
- logger.info("[璇煶瀵硅] 閫氶亾寤虹珛鎴愬姛, device: {}, channel: {}", deviceId, channelId);
- });
- } else {
- // 娴佹敞閿�
- playService.stopTalk(device, channelId, param.isRegist());
- }
- } else {
- logger.info("[璇煶瀵硅] 鏈壘鍒拌澶囷細{}", deviceId);
- }
- }
- }
-
- } else {
- if (!"rtp".equals(param.getApp())) {
- String type = OriginType.values()[param.getOriginType()].getType();
- if (param.isRegist()) {
- StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(
- param.getApp(), param.getStream());
- String callId = null;
- if (streamAuthorityInfo != null) {
- callId = streamAuthorityInfo.getCallId();
- }
- StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,
- param.getApp(), param.getStream(), MediaInfo.getInstance(param), 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()
- || param.getOriginType() == OriginType.RTC_PUSH.ordinal()) {
- param.setSeverId(userSetting.getServerId());
- zlmMediaListManager.addPush(param);
-
- // 鍐椾綑鏁版嵁锛岃嚜宸辩郴缁熶腑鑷敤
- redisCatchStorage.addPushListItem(param.getApp(), param.getStream(), param);
- }
- } else {
- // 鍏煎娴佹敞閿�鏃剁被鍨嬩粠redis璁板綍鑾峰彇
- OnStreamChangedHookParam onStreamChangedHookParam = redisCatchStorage.getStreamInfo(
- param.getApp(), param.getStream(), param.getMediaServerId());
- if (onStreamChangedHookParam != null) {
- type = OriginType.values()[onStreamChangedHookParam.getOriginType()].getType();
- redisCatchStorage.removeStream(mediaInfo.getId(), type, param.getApp(), param.getStream());
- if ("PUSH".equalsIgnoreCase(type)) {
- // 鍐椾綑鏁版嵁锛岃嚜宸辩郴缁熶腑鑷敤
- redisCatchStorage.removePushListItem(param.getApp(), param.getStream(), param.getMediaServerId());
- }
- }
- GbStream gbStream = storager.getGbStream(param.getApp(), param.getStream());
- if (gbStream != null) {
-// eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);
- }
- zlmMediaListManager.removeMedia(param.getApp(), param.getStream());
- }
- GbStream gbStream = storager.getGbStream(param.getApp(), param.getStream());
- if (gbStream != null) {
- if (userSetting.isUsePushingAsStatus()) {
- eventPublisher.catalogEventPublishForStream(null, gbStream, param.isRegist() ? CatalogEvent.ON : CatalogEvent.OFF);
- }
- }
- if (type != null) {
- // 鍙戦�佹祦鍙樺寲redis娑堟伅
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("serverId", userSetting.getServerId());
- jsonObject.put("app", param.getApp());
- jsonObject.put("stream", param.getStream());
- jsonObject.put("register", param.isRegist());
- jsonObject.put("mediaServerId", param.getMediaServerId());
- redisCatchStorage.sendStreamChangeMsg(type, jsonObject);
- }
- }
- }
- if (!param.isRegist()) {
- List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByStream(param.getStream());
- if (!sendRtpItems.isEmpty()) {
- for (SendRtpItem sendRtpItem : sendRtpItems) {
- if (sendRtpItem != null && sendRtpItem.getApp().equals(param.getApp())) {
- String platformId = sendRtpItem.getPlatformId();
- ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
- Device device = deviceService.getDevice(platformId);
-
- try {
- if (platform != null) {
- commanderFroPlatform.streamByeCmd(platform, sendRtpItem);
- redisCatchStorage.deleteSendRTPServer(platformId, sendRtpItem.getChannelId(),
- sendRtpItem.getCallId(), sendRtpItem.getStream());
- } else {
- cmder.streamByeCmd(device, sendRtpItem.getChannelId(), param.getStream(), sendRtpItem.getCallId());
- if (sendRtpItem.getPlayType().equals(InviteStreamType.BROADCAST)
- || sendRtpItem.getPlayType().equals(InviteStreamType.TALK)) {
- AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
- if (audioBroadcastCatch != null) {
- // 鏉ヨ嚜涓婄骇骞冲彴鐨勫仠姝㈠璁�
- logger.info("[鍋滄瀵硅] 鏉ヨ嚜涓婄骇锛屽钩鍙帮細{}, 閫氶亾锛歿}", sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
- audioBroadcastManager.del(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
- }
- }
- }
- } catch (SipException | InvalidArgumentException | ParseException |
- SsrcTransactionNotFoundException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍙戦�丅YE: {}", e.getMessage());
- }
- }
- }
- }
- }
- }
- });
return HookResult.SUCCESS();
}
@@ -447,99 +241,23 @@
logger.info("[ZLM HOOK]娴佹棤浜鸿鐪嬶細{}->{}->{}/{}", param.getMediaServerId(), param.getSchema(),
param.getApp(), param.getStream());
- JSONObject ret = new JSONObject();
- ret.put("code", 0);
- // 鍥芥爣绫诲瀷鐨勬祦
- if ("rtp".equals(param.getApp())) {
- ret.put("close", userSetting.getStreamOnDemand());
- // 鍥芥爣娴侊紝 鐐规挱/褰曞儚鍥炴斁/褰曞儚涓嬭浇
- InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream());
- // 鐐规挱
- if (inviteInfo != null) {
- // 褰曞儚涓嬭浇
- if (inviteInfo.getType() == InviteSessionType.DOWNLOAD) {
- ret.put("close", false);
- return ret;
- }
- // 鏀跺埌鏃犱汉瑙傜湅璇存槑娴佷篃娌℃湁鍦ㄥ線涓婄骇鎺ㄩ��
- if (redisCatchStorage.isChannelSendingRTP(inviteInfo.getChannelId())) {
- List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByChannelId(
- inviteInfo.getChannelId());
- if (!sendRtpItems.isEmpty()) {
- for (SendRtpItem sendRtpItem : sendRtpItems) {
- ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());
- try {
- commanderFroPlatform.streamByeCmd(parentPlatform, sendRtpItem.getCallId());
- } catch (SipException | InvalidArgumentException | ParseException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍙戦�丅YE: {}", e.getMessage());
- }
- redisCatchStorage.deleteSendRTPServer(parentPlatform.getServerGBId(), sendRtpItem.getChannelId(),
- sendRtpItem.getCallId(), sendRtpItem.getStream());
- if (InviteStreamType.PUSH == sendRtpItem.getPlayType()) {
- MessageForPushChannel messageForPushChannel = MessageForPushChannel.getInstance(0,
- sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getChannelId(),
- sendRtpItem.getPlatformId(), parentPlatform.getName(), userSetting.getServerId(), sendRtpItem.getMediaServerId());
- messageForPushChannel.setPlatFormIndex(parentPlatform.getId());
- redisCatchStorage.sendPlatformStopPlayMsg(messageForPushChannel);
- }
- }
- }
- }
- Device device = deviceService.getDevice(inviteInfo.getDeviceId());
- if (device != null) {
- try {
- // 澶氭煡璇竴娆￠槻姝㈠凡缁忚澶勭悊浜�
- InviteInfo info = inviteStreamService.getInviteInfo(inviteInfo.getType(),
- inviteInfo.getDeviceId(), inviteInfo.getChannelId(), inviteInfo.getStream());
- if (info != null) {
- cmder.streamByeCmd(device, inviteInfo.getChannelId(),
- inviteInfo.getStream(), null);
- } else {
- logger.info("[鏃犱汉瑙傜湅] 鏈壘鍒拌澶囩殑鐐规挱淇℃伅锛� {}锛� 娴侊細{}", inviteInfo.getDeviceId(), param.getStream());
- }
- } catch (InvalidArgumentException | ParseException | SipException |
- SsrcTransactionNotFoundException e) {
- logger.error("[鏃犱汉瑙傜湅]鐐规挱锛� 鍙戦�丅YE澶辫触 {}", e.getMessage());
- }
- } else {
- logger.info("[鏃犱汉瑙傜湅] 鏈壘鍒拌澶囷細 {}锛屾祦锛歿}", inviteInfo.getDeviceId(), param.getStream());
- }
- inviteStreamService.removeInviteInfo(inviteInfo.getType(), inviteInfo.getDeviceId(),
- inviteInfo.getChannelId(), inviteInfo.getStream());
- storager.stopPlay(inviteInfo.getDeviceId(), inviteInfo.getChannelId());
- return ret;
- }
- SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(null, null, param.getStream(), null);
- if (sendRtpItem != null && "talk".equals(sendRtpItem.getApp())) {
- ret.put("close", false);
- return ret;
- }
- } else if ("talk".equals(param.getApp()) || "broadcast".equals(param.getApp())) {
- ret.put("close", false);
- } else {
- // 闈炲浗鏍囨祦 鎺ㄦ祦/鎷夋祦浠ｇ悊
- // 鎷夋祦浠ｇ悊
- StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());
- if (streamProxyItem != null) {
- if (streamProxyItem.isEnableRemoveNoneReader()) {
- // 鏃犱汉瑙傜湅鑷姩绉婚櫎
- ret.put("close", true);
- streamProxyService.del(param.getApp(), param.getStream());
- String url = streamProxyItem.getUrl() != null ? streamProxyItem.getUrl() : streamProxyItem.getSrcUrl();
- logger.info("[{}/{}]<-[{}] 鎷夋祦浠ｇ悊鏃犱汉瑙傜湅宸茬粡绉婚櫎", param.getApp(), param.getStream(), url);
- } else if (streamProxyItem.isEnableDisableNoneReader()) {
- // 鏃犱汉瑙傜湅鍋滅敤
- ret.put("close", true);
- // 淇敼鏁版嵁
- streamProxyService.stop(param.getApp(), param.getStream());
- } else {
- // 鏃犱汉瑙傜湅涓嶅仛澶勭悊
- ret.put("close", false);
- }
- return ret;
- }
+ MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());
+ if (mediaInfo == null) {
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ return ret;
}
+ if (!ObjectUtils.isEmpty(mediaInfo.getTranscodeSuffix())
+ && !"null".equalsIgnoreCase(mediaInfo.getTranscodeSuffix())
+ && param.getStream().endsWith(mediaInfo.getTranscodeSuffix()) ) {
+ param.setStream(param.getStream().substring(0, param.getStream().lastIndexOf(mediaInfo.getTranscodeSuffix()) -1 ));
+ }
+
+ JSONObject ret = new JSONObject();
+ boolean close = mediaService.closeStreamOnNoneReader(param.getMediaServerId(), param.getApp(), param.getStream(), param.getSchema());
+ ret.put("code", 0);
+ ret.put("close", close);
return ret;
}
@@ -548,119 +266,17 @@
*/
@ResponseBody
@PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")
- public DeferredResult<HookResult> onStreamNotFound(@RequestBody OnStreamNotFoundHookParam param) {
+ public HookResult onStreamNotFound(@RequestBody OnStreamNotFoundHookParam param) {
logger.info("[ZLM HOOK] 娴佹湭鎵惧埌锛歿}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
- DeferredResult<HookResult> defaultResult = new DeferredResult<>();
- MediaServer mediaInfo = mediaServerService.getOne(param.getMediaServerId());
- if (!userSetting.isAutoApplyPlay() || mediaInfo == null) {
- defaultResult.setResult(new HookResult(ErrorCode.ERROR404.getCode(), ErrorCode.ERROR404.getMsg()));
- return defaultResult;
+ MediaServer mediaServer = mediaServerService.getOne(param.getMediaServerId());
+ if (!userSetting.isAutoApplyPlay() || mediaServer == null) {
+ return HookResult.SUCCESS();
}
-
- if ("rtp".equals(param.getApp())) {
- String[] s = param.getStream().split("_");
- if ((s.length != 2 && s.length != 4)) {
- defaultResult.setResult(HookResult.SUCCESS());
- return defaultResult;
- }
- String deviceId = s[0];
- String channelId = s[1];
- Device device = redisCatchStorage.getDevice(deviceId);
- if (device == null || !device.isOnLine()) {
- defaultResult.setResult(new HookResult(ErrorCode.ERROR404.getCode(), ErrorCode.ERROR404.getMsg()));
- return defaultResult;
- }
- DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
- if (deviceChannel == null) {
- defaultResult.setResult(new HookResult(ErrorCode.ERROR404.getCode(), ErrorCode.ERROR404.getMsg()));
- return defaultResult;
- }
- if (s.length == 2) {
- logger.info("[ZLM HOOK] 棰勮娴佹湭鎵惧埌, 鍙戣捣鑷姩鐐规挱锛歿}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
-
- RequestMessage msg = new RequestMessage();
- String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;
- boolean exist = resultHolder.exist(key, null);
- msg.setKey(key);
- String uuid = UUID.randomUUID().toString();
- msg.setId(uuid);
- DeferredResult<HookResult> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
-
- result.onTimeout(() -> {
- logger.info("[ZLM HOOK] 棰勮娴佽嚜鍔ㄧ偣鎾�, 绛夊緟瓒呮椂");
- msg.setData(new HookResult(ErrorCode.ERROR100.getCode(), "鐐规挱瓒呮椂"));
- resultHolder.invokeAllResult(msg);
- inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
- storager.stopPlay(deviceId, channelId);
- });
-
- resultHolder.put(key, uuid, result);
-
- if (!exist) {
- playService.play(mediaInfo, deviceId, channelId, null, (code, message, data) -> {
- msg.setData(new HookResult(code, message));
- resultHolder.invokeResult(msg);
- });
- }
- return result;
- } else if (s.length == 4) {
- // 姝ゆ椂涓哄綍鍍忓洖鏀撅紝 褰曞儚鍥炴斁鏍煎紡涓�> 璁惧ID_閫氶亾ID_寮�濮嬫椂闂確缁撴潫鏃堕棿
- String startTimeStr = s[2];
- String endTimeStr = s[3];
- if (startTimeStr == null || endTimeStr == null || startTimeStr.length() != 14 || endTimeStr.length() != 14) {
- defaultResult.setResult(HookResult.SUCCESS());
- return defaultResult;
- }
- String startTime = DateUtil.urlToyyyy_MM_dd_HH_mm_ss(startTimeStr);
- String endTime = DateUtil.urlToyyyy_MM_dd_HH_mm_ss(endTimeStr);
- logger.info("[ZLM HOOK] 鍥炴斁娴佹湭鎵惧埌, 鍙戣捣鑷姩鐐规挱锛歿}->{}->{}/{}-{}-{}",
- param.getMediaServerId(), param.getSchema(),
- param.getApp(), param.getStream(),
- startTime, endTime
- );
- RequestMessage msg = new RequestMessage();
- String key = DeferredResultHolder.CALLBACK_CMD_PLAYBACK + deviceId + channelId;
- boolean exist = resultHolder.exist(key, null);
- msg.setKey(key);
- String uuid = UUID.randomUUID().toString();
- msg.setId(uuid);
- DeferredResult<HookResult> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
-
- result.onTimeout(() -> {
- logger.info("[ZLM HOOK] 鍥炴斁娴佽嚜鍔ㄧ偣鎾�, 绛夊緟瓒呮椂");
- // 閲婃斁rtpserver
- msg.setData(new HookResult(ErrorCode.ERROR100.getCode(), "鐐规挱瓒呮椂"));
- resultHolder.invokeResult(msg);
- });
-
- resultHolder.put(key, uuid, result);
-
- if (!exist) {
- SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaInfo, param.getStream(), null,
- device.isSsrcCheck(), true, 0, false, false, device.getStreamModeForParam());
- playService.playBack(mediaInfo, ssrcInfo, deviceId, channelId, startTime, endTime, (code, message, data) -> {
- msg.setData(new HookResult(code, message));
- resultHolder.invokeResult(msg);
- });
- }
- return result;
- } else {
- defaultResult.setResult(HookResult.SUCCESS());
- return defaultResult;
- }
-
- } else {
- // 鎷夋祦浠ｇ悊
- StreamProxyItem streamProxyByAppAndStream = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());
- if (streamProxyByAppAndStream != null && streamProxyByAppAndStream.isEnableDisableNoneReader()) {
- streamProxyService.start(param.getApp(), param.getStream());
- }
- DeferredResult<HookResult> result = new DeferredResult<>();
- result.setResult(HookResult.SUCCESS());
- return result;
- }
+ MediaNotFoundEvent mediaNotFoundEvent = MediaNotFoundEvent.getInstance(this, param, mediaServer);
+ applicationEventPublisher.publishEvent(mediaNotFoundEvent);
+ return HookResult.SUCCESS();
}
/**
@@ -674,14 +290,6 @@
ZLMServerConfig zlmServerConfig = JSON.to(ZLMServerConfig.class, jsonObject);
zlmServerConfig.setIp(request.getRemoteAddr());
logger.info("[ZLM HOOK] zlm 鍚姩 " + zlmServerConfig.getGeneralMediaServerId());
- taskExecutor.execute(() -> {
- List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_started);
- if (subscribes != null && !subscribes.isEmpty()) {
- for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
- subscribe.response(null, zlmServerConfig);
- }
- }
- });
try {
HookZlmServerStartEvent event = new HookZlmServerStartEvent(this);
MediaServer mediaServerItem = mediaServerService.getOne(zlmServerConfig.getMediaServerId());
@@ -709,22 +317,16 @@
if (!"rtp".equals(param.getApp())) {
return HookResult.SUCCESS();
}
- taskExecutor.execute(() -> {
- List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByStream(param.getStream());
- if (sendRtpItems.size() > 0) {
- for (SendRtpItem sendRtpItem : sendRtpItems) {
- ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());
- ssrcFactory.releaseSsrc(sendRtpItem.getMediaServerId(), sendRtpItem.getSsrc());
- try {
- commanderFroPlatform.streamByeCmd(parentPlatform, sendRtpItem.getCallId());
- } catch (SipException | InvalidArgumentException | ParseException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍙戦�丅YE: {}", e.getMessage());
- }
- redisCatchStorage.deleteSendRTPServer(parentPlatform.getServerGBId(), sendRtpItem.getChannelId(),
- sendRtpItem.getCallId(), sendRtpItem.getStream());
- }
+ try {
+ MediaSendRtpStoppedEvent event = new MediaSendRtpStoppedEvent(this);
+ MediaServer mediaServerItem = mediaServerService.getOne(param.getMediaServerId());
+ if (mediaServerItem != null) {
+ event.setMediaServer(mediaServerItem);
+ applicationEventPublisher.publishEvent(event);
}
- });
+ }catch (Exception e) {
+ logger.info("[ZLM-HOOK-rtp鍙戦�佸叧闂璢 鍙戦�侀�氱煡澶辫触 ", e);
+ }
return HookResult.SUCCESS();
}
@@ -738,14 +340,17 @@
param) {
logger.info("[ZLM HOOK] rtpServer鏀舵祦瓒呮椂锛歿}->{}({})", param.getMediaServerId(), param.getStream_id(), param.getSsrc());
- taskExecutor.execute(() -> {
- List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_rtp_server_timeout);
- if (subscribes != null && !subscribes.isEmpty()) {
- for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
- subscribe.response(null, param);
- }
+ try {
+ MediaRtpServerTimeoutEvent event = new MediaRtpServerTimeoutEvent(this);
+ 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);
+ }
return HookResult.SUCCESS();
}
@@ -758,35 +363,17 @@
public HookResult onRecordMp4(HttpServletRequest request, @RequestBody OnRecordMp4HookParam param) {
logger.info("[ZLM HOOK] 褰曞儚瀹屾垚浜嬩欢锛歿}->{}", param.getMediaServerId(), param.getFile_path());
- taskExecutor.execute(() -> {
- List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_record_mp4);
- if (subscribes != null && !subscribes.isEmpty()) {
- for (ZlmHttpHookSubscribe.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();
- }
-
- private Map<String, String> urlParamToMap(String params) {
- HashMap<String, String> map = new HashMap<>();
- if (ObjectUtils.isEmpty(params)) {
- return map;
- }
- String[] paramsArray = params.split("&");
- if (paramsArray.length == 0) {
- return map;
- }
- for (String param : paramsArray) {
- String[] paramArray = param.split("=");
- if (paramArray.length == 2) {
- map.put(paramArray[0], paramArray[1]);
- }
- }
- return map;
}
}
--
Gitblit v1.8.0