From b37a77f23f995758178b6af38b89a860107d218d Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 25 三月 2021 16:45:29 +0800
Subject: [PATCH] 解决循环依赖导致的打包失败
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java | 124 +++++++++++++++++++++++++++++++----------
1 files changed, 93 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java
index 7a5b25d..20e1c80 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java
@@ -1,51 +1,113 @@
package com.genersoft.iot.vmp.gb28181.transmit.request.impl;
-import javax.sip.Dialog;
-import javax.sip.InvalidArgumentException;
-import javax.sip.RequestEvent;
-import javax.sip.ServerTransaction;
-import javax.sip.SipException;
-import javax.sip.message.Request;
+import java.util.HashMap;
+import java.util.Map;
-import org.springframework.stereotype.Component;
+import javax.sip.*;
+import javax.sip.address.SipURI;
+import javax.sip.header.FromHeader;
+import javax.sip.header.HeaderAddress;
+import javax.sip.header.ToHeader;
-import com.genersoft.iot.vmp.gb28181.SipLayer;
-import com.genersoft.iot.vmp.gb28181.transmit.request.ISIPRequestProcessor;
-
-import gov.nist.javax.sip.header.CSeq;
+import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
+import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor;
+import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
/**
* @Description:ACK璇锋眰澶勭悊鍣�
- * @author: songww
+ * @author: swwheihei
* @date: 2020骞�5鏈�3鏃� 涓嬪崍5:31:45
*/
-@Component
-public class AckRequestProcessor implements ISIPRequestProcessor {
-
+public class AckRequestProcessor extends SIPRequestAbstractProcessor {
+
+ private IRedisCatchStorage redisCatchStorage;
+
+ private ZLMRTPServerFactory zlmrtpServerFactory;
+
/**
* 澶勭悊 ACK璇锋眰
*
* @param evt
- * @param layer
- * @param transaction
- * @param config
- */
+ */
@Override
- public void process(RequestEvent evt, SipLayer layer) {
- Request request = evt.getRequest();
+ public void process(RequestEvent evt) {
+ //Request request = evt.getRequest();
Dialog dialog = evt.getDialog();
- try {
- Request ackRequest = null;
- CSeq csReq = (CSeq) request.getHeader(CSeq.NAME);
- ackRequest = dialog.createAck(csReq.getSeqNumber());
- dialog.sendAck(ackRequest);
- System.out.println("send ack to callee:" + ackRequest.toString());
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
+ if (dialog == null) return;
+ //DialogState state = dialog.getState();
+ if (/*request.getMecodewwthod().equals(Request.INVITE) &&*/ dialog.getState()== DialogState.CONFIRMED) {
+ String platformGbId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();
+ String channelId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platformGbId, channelId);
+ String is_Udp = sendRtpItem.isTcp() ? "0" : "1";
+ String deviceId = sendRtpItem.getDeviceId();
+ StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
+ sendRtpItem.setStreamId(streamInfo.getStreamId());
+ redisCatchStorage.updateSendRTPSever(sendRtpItem);
+ System.out.println(platformGbId);
+ System.out.println(channelId);
+ Map<String, Object> param = new HashMap<>();
+ param.put("vhost","__defaultVhost__");
+ param.put("app","rtp");
+ param.put("stream",streamInfo.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) {
+ if (zlmrtpServerFactory.isRtpReady(streamInfo.getStreamId())) {
+ rtpPushed = true;
+ System.out.println("宸茶幏鍙栬澶囨帹娴侊紝寮�濮嬪悜涓婄骇鎺ㄦ祦");
+ zlmrtpServerFactory.startSendRtpStream(param);
+ } else {
+ System.out.println("绛夊緟璁惧鎺ㄦ祦.......");
+ Thread.sleep(2000);
+ continue;
+ }
+ } else {
+ rtpPushed = true;
+ System.out.println("璁惧鎺ㄦ祦瓒呮椂锛岀粓姝㈠悜涓婄骇鎺ㄦ祦");
+ }
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
}
+ // try {
+ // Request ackRequest = null;
+ // CSeq csReq = (CSeq) request.getHeader(CSeq.NAME);
+ // ackRequest = dialog.createAck(csReq.getSeqNumber());
+ // dialog.sendAck(ackRequest);
+ // System.out.println("send ack to callee:" + ackRequest.toString());
+ // } catch (SipException e) {
+ // e.printStackTrace();
+ // } catch (InvalidArgumentException e) {
+ // e.printStackTrace();
+ // }
}
+ public IRedisCatchStorage getRedisCatchStorage() {
+ return redisCatchStorage;
+ }
+
+ public void setRedisCatchStorage(IRedisCatchStorage redisCatchStorage) {
+ this.redisCatchStorage = redisCatchStorage;
+ }
+
+ public ZLMRTPServerFactory getZlmrtpServerFactory() {
+ return zlmrtpServerFactory;
+ }
+
+ public void setZlmrtpServerFactory(ZLMRTPServerFactory zlmrtpServerFactory) {
+ this.zlmrtpServerFactory = zlmrtpServerFactory;
+ }
}
--
Gitblit v1.8.0