From c592740efa9d907eac3ad7d8f6e720608f3e962f Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期日, 01 五月 2022 21:33:56 +0800
Subject: [PATCH] 升级shelljs，解决较高版本node打包时的警告
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java | 125 +++++++++++++++++++++++++----------------
1 files changed, 77 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
index 98ae86f..ec83fa8 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
@@ -1,10 +1,14 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
@@ -19,11 +23,11 @@
import javax.sip.DialogState;
import javax.sip.RequestEvent;
import javax.sip.address.SipURI;
+import javax.sip.header.CallIdHeader;
import javax.sip.header.FromHeader;
import javax.sip.header.HeaderAddress;
import javax.sip.header.ToHeader;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
/**
* SIP鍛戒护绫诲瀷锛� ACK璇锋眰
@@ -52,6 +56,12 @@
@Autowired
private IMediaServerService mediaServerService;
+ @Autowired
+ private ZLMHttpHookSubscribe subscribe;
+
+ @Autowired
+ private DynamicTask dynamicTask;
+
/**
* 澶勭悊 ACK璇锋眰
@@ -61,63 +71,82 @@
@Override
public void process(RequestEvent evt) {
Dialog dialog = evt.getDialog();
+ CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
if (dialog == null) return;
if (dialog.getState()== DialogState.CONFIRMED) {
String platformGbId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();
+ logger.info("ACK璇锋眰锛� platformGbId->{}", platformGbId);
+ // 鍙栨秷璁剧疆鐨勮秴鏃朵换鍔�
+ dynamicTask.stop(callIdHeader.getCallId());
String channelId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
- SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platformGbId, channelId);
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platformGbId, channelId, null, callIdHeader.getCallId());
String is_Udp = sendRtpItem.isTcp() ? "0" : "1";
- String deviceId = sendRtpItem.getDeviceId();
- StreamInfo streamInfo = null;
- if (deviceId == null) {
- streamInfo = new StreamInfo();
- streamInfo.setApp(sendRtpItem.getApp());
- streamInfo.setStream(sendRtpItem.getStreamId());
- }else {
- streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
- sendRtpItem.setStreamId(streamInfo.getStream());
- streamInfo.setApp("rtp");
- }
-
- redisCatchStorage.updateSendRTPSever(sendRtpItem);
- logger.info(platformGbId);
- logger.info(channelId);
+ MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ logger.info("鏀跺埌ACK锛屽紑濮嬪悜涓婄骇鎺ㄦ祦 rtp/{}", sendRtpItem.getStreamId());
Map<String, Object> param = new HashMap<>();
param.put("vhost","__defaultVhost__");
- param.put("app",streamInfo.getApp());
- param.put("stream",streamInfo.getStream());
+ param.put("app",sendRtpItem.getApp());
+ param.put("stream",sendRtpItem.getStreamId());
param.put("ssrc", sendRtpItem.getSsrc());
param.put("dst_url",sendRtpItem.getIp());
param.put("dst_port", sendRtpItem.getPort());
param.put("is_udp", is_Udp);
- //param.put ("src_port", sendRtpItem.getLocalPort());
- // 璁惧鎺ㄦ祦鏌ヨ锛屾垚鍔熷悗鎵嶈兘杞帹
- boolean rtpPushed = false;
- long startTime = System.currentTimeMillis();
- while (!rtpPushed) {
- try {
- if (System.currentTimeMillis() - startTime < 30 * 1000) {
- MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
- if (zlmrtpServerFactory.isStreamReady(mediaInfo, streamInfo.getApp(), streamInfo.getStream())) {
- rtpPushed = true;
- logger.info("宸茶幏鍙栬澶囨帹娴乕{}/{}]锛屽紑濮嬪悜涓婄骇鎺ㄦ祦[{}:{}]",
- streamInfo.getApp() ,streamInfo.getStream(), sendRtpItem.getIp(), sendRtpItem.getPort());
- zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
- } else {
- logger.info("绛夊緟璁惧鎺ㄦ祦[{}/{}].......",
- streamInfo.getApp() ,streamInfo.getStream());
- Thread.sleep(1000);
- continue;
- }
- } else {
- rtpPushed = true;
- logger.info("璁惧鎺ㄦ祦[{}/{}]瓒呮椂锛岀粓姝㈠悜涓婄骇鎺ㄦ祦",
- streamInfo.getApp() ,streamInfo.getStream());
- }
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
+ param.put("src_port", sendRtpItem.getLocalPort());
+ zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
+
+
+
+// if (streamInfo == null) { // 娴佽繕娌′笂鏉ワ紝瀵规柟灏卞洖澶峚ck
+// logger.info("鐩戝惉娴佷互绛夊緟娴佷笂绾�1 rtp/{}", sendRtpItem.getStreamId());
+// // 鐩戝惉娴佷笂绾�
+// // 娣诲姞璁㈤槄
+// JSONObject subscribeKey = new JSONObject();
+// subscribeKey.put("app", "rtp");
+// subscribeKey.put("stream", sendRtpItem.getStreamId());
+// subscribeKey.put("regist", true);
+// subscribeKey.put("schema", "rtmp");
+// subscribeKey.put("mediaServerId", sendRtpItem.getMediaServerId());
+// subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,
+// (MediaServerItem mediaServerItemInUse, JSONObject json)->{
+// Map<String, Object> param = new HashMap<>();
+// param.put("vhost","__defaultVhost__");
+// param.put("app",json.getString("app"));
+// param.put("stream",json.getString("stream"));
+// param.put("ssrc", sendRtpItem.getSsrc());
+// param.put("dst_url",sendRtpItem.getIp());
+// param.put("dst_port", sendRtpItem.getPort());
+// param.put("is_udp", is_Udp);
+// param.put("src_port", sendRtpItem.getLocalPort());
+// zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
+// });
+// }else {
+// Map<String, Object> param = new HashMap<>();
+// param.put("vhost","__defaultVhost__");
+// param.put("app",streamInfo.getApp());
+// param.put("stream",streamInfo.getStream());
+// param.put("ssrc", sendRtpItem.getSsrc());
+// param.put("dst_url",sendRtpItem.getIp());
+// param.put("dst_port", sendRtpItem.getPort());
+// param.put("is_udp", is_Udp);
+// param.put("src_port", sendRtpItem.getLocalPort());
+//
+// JSONObject jsonObject = zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
+// if (jsonObject.getInteger("code") != 0) {
+// logger.info("鐩戝惉娴佷互绛夊緟娴佷笂绾�2 {}/{}", streamInfo.getApp(), streamInfo.getStream());
+// // 鐩戝惉娴佷笂绾�
+// // 娣诲姞璁㈤槄
+// JSONObject subscribeKey = new JSONObject();
+// subscribeKey.put("app", "rtp");
+// subscribeKey.put("stream", streamInfo.getStream());
+// subscribeKey.put("regist", true);
+// subscribeKey.put("schema", "rtmp");
+// subscribeKey.put("mediaServerId", sendRtpItem.getMediaServerId());
+// subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,
+// (MediaServerItem mediaServerItemInUse, JSONObject json)->{
+// zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
+// });
+// }
+// }
}
}
}
--
Gitblit v1.8.0