From f840c85666369d407ff08ceb6ba30b17aa9d0d4e Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期三, 10 三月 2021 12:21:05 +0800
Subject: [PATCH] 修正一处可能导致死循环的代码
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java | 109 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 91 insertions(+), 18 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 13d630c..d93ba9c 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,22 +1,34 @@
package com.genersoft.iot.vmp.gb28181.transmit.request.impl;
-import javax.sip.Dialog;
-import javax.sip.InvalidArgumentException;
-import javax.sip.RequestEvent;
-import javax.sip.SipException;
-import javax.sip.message.Request;
+import java.util.HashMap;
+import java.util.Map;
+import javax.sip.*;
+//import javax.sip.message.Request;
+
+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;
-import gov.nist.javax.sip.header.CSeq;
+import org.springframework.stereotype.Component;
/**
* @Description:ACK璇锋眰澶勭悊鍣�
* @author: swwheihei
* @date: 2020骞�5鏈�3鏃� 涓嬪崍5:31:45
*/
+@Component
public class AckRequestProcessor extends SIPRequestAbstractProcessor {
-
+
+ //@Autowired
+ private IRedisCatchStorage redisCatchStorage;
+
+ //@Autowired
+ private ZLMRTPServerFactory zlmrtpServerFactory;
+
+
/**
* 澶勭悊 ACK璇锋眰
*
@@ -24,21 +36,82 @@
*/
@Override
public void process(RequestEvent evt) {
- Request request = evt.getRequest();
+ //Request request = evt.getRequest();
Dialog dialog = evt.getDialog();
if (dialog == null) return;
- 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();
+ //DialogState state = dialog.getState();
+ if (/*request.getMethod().equals(Request.INVITE) &&*/ dialog.getState()== DialogState.CONFIRMED) {
+ String remoteUri = dialog.getRemoteParty().getURI().toString();
+ String localUri = dialog.getLocalParty().getURI().toString();
+ String platformGbId = remoteUri.substring(remoteUri.indexOf(":") + 1, remoteUri.indexOf("@"));
+ String channelId = localUri.substring(remoteUri.indexOf(":") + 1, remoteUri.indexOf("@"));
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platformGbId, channelId);
+ String is_Udp = sendRtpItem.isTcp() ? "0" : "1";
+ String deviceId = sendRtpItem.getDeviceId();
+ StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
+ 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