From 39efda779fcd5d613870e9024cda69da28e571b2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 16 五月 2022 11:47:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java | 155 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 117 insertions(+), 38 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 8556730..153a08a 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
@@ -4,8 +4,11 @@
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.bean.*;
+import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
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;
@@ -13,6 +16,10 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import gov.nist.javax.sip.message.SIPRequest;
+import gov.nist.javax.sip.stack.SIPDialog;
+import org.ehcache.shadow.org.terracotta.offheapstore.storage.IntegerStorageEngine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
@@ -22,18 +29,18 @@
import javax.sip.Dialog;
import javax.sip.DialogState;
import javax.sip.RequestEvent;
+import javax.sip.SipException;
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.Timer;
-import java.util.TimerTask;
+import java.text.ParseException;
+import java.util.*;
/**
* SIP鍛戒护绫诲瀷锛� ACK璇锋眰
+ * @author lin
*/
@Component
public class AckRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
@@ -54,6 +61,9 @@
private IRedisCatchStorage redisCatchStorage;
@Autowired
+ private IVideoManagerStorage storager;
+
+ @Autowired
private ZLMRTPServerFactory zlmrtpServerFactory;
@Autowired
@@ -65,6 +75,15 @@
@Autowired
private DynamicTask dynamicTask;
+ @Autowired
+ private ISIPCommander cmder;
+
+ @Autowired
+ private ISIPCommanderForPlatform commanderForPlatform;
+
+ @Autowired
+ private AudioBroadcastManager audioBroadcastManager;
+
/**
* 澶勭悊 ACK璇锋眰
@@ -75,53 +94,113 @@
public void process(RequestEvent evt) {
Dialog dialog = evt.getDialog();
CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
- if (dialog == null) return;
+ 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);
+ ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformGbId);
// 鍙栨秷璁剧疆鐨勮秴鏃朵换鍔�
dynamicTask.stop(callIdHeader.getCallId());
- String channelId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
- SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platformGbId, channelId, null, callIdHeader.getCallId());
+// String channelId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platformGbId, null, null, callIdHeader.getCallId());
String is_Udp = sendRtpItem.isTcp() ? "0" : "1";
- String deviceId = sendRtpItem.getDeviceId();
- StreamInfo streamInfo = null;
- if (sendRtpItem.isPlay()) {
- streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
- }else {
- streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId);
- }
- if (streamInfo == null) {
- streamInfo = new StreamInfo();
- streamInfo.setApp(sendRtpItem.getApp());
- streamInfo.setStream(sendRtpItem.getStreamId());
- }
- redisCatchStorage.updateSendRTPSever(sendRtpItem);
+ 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);
- MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ param.put("src_port", sendRtpItem.getLocalPort());
+ param.put("pt", sendRtpItem.getPt());
+ param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
+ param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
JSONObject jsonObject = zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
- if (jsonObject.getInteger("code") != 0) {
- logger.info("鐩戝惉娴佷互绛夊緟娴佷笂绾縶}/{}", 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);
- });
+ if (jsonObject == null) {
+ logger.error("RTP鎺ㄦ祦澶辫触: 璇锋鏌LM鏈嶅姟");
+ } else if (jsonObject.getInteger("code") == 0) {
+ if (sendRtpItem.isOnlyAudio()) {
+ AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
+ audioBroadcastCatch.setStatus(AudioBroadcastCatchStatus.Ok);
+ audioBroadcastCatch.setDialog((SIPDialog) evt.getDialog());
+ audioBroadcastCatch.setRequest((SIPRequest) evt.getRequest());
+ audioBroadcastManager.update(audioBroadcastCatch);
+ }
+ logger.info("RTP鎺ㄦ祦鎴愬姛[ {}/{} ]锛寋}->{}:{}, " ,param.get("app"), param.get("stream"), jsonObject.getString("local_port"), param.get("dst_url"), param.get("dst_port"));
+ } else {
+ logger.error("RTP鎺ㄦ祦澶辫触: {}, 鍙傛暟锛歿}",jsonObject.getString("msg"),JSONObject.toJSON(param));
+ if (sendRtpItem.isOnlyAudio()) {
+ // 璇煶瀵硅
+ try {
+ cmder.streamByeCmd((SIPDialog) evt.getDialog(), (SIPRequest)evt.getRequest(), null);
+ } catch (SipException e) {
+ throw new RuntimeException(e);
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ }else {
+ // 鍚戜笂绾у钩鍙�
+ commanderForPlatform.streamByeCmd(parentPlatform, callIdHeader.getCallId());
+ }
}
+
+
+// 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