From 71fe60d885b09d53fcd4c58afcfccf18d24a94c2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 11 四月 2024 15:34:56 +0800
Subject: [PATCH] 更新README
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java | 185 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 155 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
old mode 100644
new mode 100755
index d9e8197..1c8353d
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
@@ -1,24 +1,32 @@
package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;
import com.alibaba.fastjson2.JSON;
+import com.genersoft.iot.vmp.common.InviteSessionType;
import com.genersoft.iot.vmp.conf.DynamicTask;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.SipLayer;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
+import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.gb28181.transmit.SIPSender;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderPlarformProvider;
import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
+import com.genersoft.iot.vmp.media.event.hook.Hook;
+import com.genersoft.iot.vmp.media.event.hook.HookSubscribe;
+import com.genersoft.iot.vmp.media.event.hook.HookType;
+import com.genersoft.iot.vmp.media.service.IMediaServerService;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.utils.GitUtil;
import gov.nist.javax.sip.message.MessageFactoryImpl;
import gov.nist.javax.sip.message.SIPRequest;
+import gov.nist.javax.sip.message.SIPResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +36,7 @@
import org.springframework.util.ObjectUtils;
import javax.sip.InvalidArgumentException;
+import javax.sip.ResponseEvent;
import javax.sip.SipException;
import javax.sip.SipFactory;
import javax.sip.header.CallIdHeader;
@@ -56,13 +65,20 @@
private SipSubscribe sipSubscribe;
@Autowired
- private ZLMServerFactory ZLMServerFactory;
-
- @Autowired
private SipLayer sipLayer;
@Autowired
private SIPSender sipSender;
+
+ @Autowired
+ private HookSubscribe subscribe;
+
+ @Autowired
+ private UserSetting userSetting;
+
+
+ @Autowired
+ private VideoStreamSessionManager streamSession;
@Autowired
private DynamicTask dynamicTask;
@@ -148,13 +164,13 @@
CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(parentPlatform.getDeviceIp(),parentPlatform.getTransport());
- Request request = headerProviderPlatformProvider.createMessageRequest(
- parentPlatform,
- keepaliveXml.toString(),
- SipUtils.getNewFromTag(),
- SipUtils.getNewViaTag(),
- callIdHeader);
- sipSender.transmitRequest(parentPlatform.getDeviceIp(), request, errorEvent, okEvent);
+ Request request = headerProviderPlatformProvider.createMessageRequest(
+ parentPlatform,
+ keepaliveXml.toString(),
+ SipUtils.getNewFromTag(),
+ SipUtils.getNewViaTag(),
+ callIdHeader);
+ sipSender.transmitRequest(parentPlatform.getDeviceIp(), request, errorEvent, okEvent);
return callIdHeader.getCallId();
}
@@ -337,8 +353,8 @@
}else {
catalogXml.append("<Password></Password>\r\n");
}
- if (!ObjectUtils.isEmpty(channel.getPTZType())) {
- catalogXml.append("<PTZType>" + channel.getPTZType() + "</PTZType>\r\n");
+ if (!ObjectUtils.isEmpty(channel.getPtzType())) {
+ catalogXml.append("<PTZType>" + channel.getPtzType() + "</PTZType>\r\n");
}else {
catalogXml.append("<PTZType></PTZType>\r\n");
}
@@ -462,6 +478,7 @@
sipSender.transmitRequest(parentPlatform.getDeviceIp(), request);
}
+
/**
* 鍚戜笂绾у洖澶岲eviceStatus鏌ヨ淇℃伅
* @param parentPlatform 骞冲彴淇℃伅
@@ -557,7 +574,7 @@
@Override
public void sendNotifyForCatalogAddOrUpdate(String type, ParentPlatform parentPlatform, List<DeviceChannel> deviceChannels, SubscribeInfo subscribeInfo, Integer index) throws InvalidArgumentException, ParseException, NoSuchFieldException, SipException, IllegalAccessException {
- if (parentPlatform == null || deviceChannels == null || deviceChannels.size() == 0 || subscribeInfo == null) {
+ if (parentPlatform == null || deviceChannels == null || deviceChannels.isEmpty() || subscribeInfo == null) {
return;
}
if (index == null) {
@@ -575,6 +592,7 @@
Integer finalIndex = index;
String catalogXmlContent = getCatalogXmlContentForCatalogAddOrUpdate(parentPlatform, channels,
deviceChannels.size(), type, subscribeInfo);
+ logger.info("[鍙戦�丯OTIFY閫氱煡]绫诲瀷锛� {}锛屽彂閫佹暟閲忥細 {}", type, channels.size());
sendNotify(parentPlatform, catalogXmlContent, subscribeInfo, eventResult -> {
logger.error("鍙戦�丯OTIFY閫氱煡娑堟伅澶辫触銆傞敊璇細{} {}", eventResult.statusCode, eventResult.msg);
}, (eventResult -> {
@@ -598,7 +616,7 @@
SIPRequest notifyRequest = headerProviderPlatformProvider.createNotifyRequest(parentPlatform, catalogXmlContent, subscribeInfo);
- sipSender.transmitRequest(parentPlatform.getDeviceIp(), notifyRequest);
+ sipSender.transmitRequest(parentPlatform.getDeviceIp(), notifyRequest, errorEvent, okEvent);
}
private String getCatalogXmlContentForCatalogAddOrUpdate(ParentPlatform parentPlatform, List<DeviceChannel> channels, int sumNum, String type, SubscribeInfo subscribeInfo) {
@@ -610,9 +628,9 @@
.append("<CmdType>Catalog</CmdType>\r\n")
.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n")
.append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n")
- .append("<SumNum>1</SumNum>\r\n")
+ .append("<SumNum>"+ sumNum +"</SumNum>\r\n")
.append("<DeviceList Num=\"" + channels.size() + "\">\r\n");
- if (channels.size() > 0) {
+ if (!channels.isEmpty()) {
for (DeviceChannel channel : channels) {
if (parentPlatform.getServerGBId().equals(channel.getParentId())) {
channel.setParentId(parentPlatform.getDeviceGBId());
@@ -679,6 +697,7 @@
}else {
channels = deviceChannels.subList(index, deviceChannels.size());
}
+ logger.info("[鍙戦�丯OTIFY閫氱煡]绫诲瀷锛� {}锛屽彂閫佹暟閲忥細 {}", type, channels.size());
Integer finalIndex = index;
String catalogXmlContent = getCatalogXmlContentForCatalogOther(parentPlatform, channels, type);
sendNotify(parentPlatform, catalogXmlContent, subscribeInfo, eventResult -> {
@@ -725,13 +744,14 @@
if ( parentPlatform ==null) {
return ;
}
+ logger.info("[鍥芥爣绾ц仈] 鍙戦�佸綍鍍忔暟鎹�氶亾锛� {}", recordInfo.getChannelId());
String characterSet = parentPlatform.getCharacterSet();
StringBuffer recordXml = new StringBuffer(600);
recordXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n")
.append("<Response>\r\n")
.append("<CmdType>RecordInfo</CmdType>\r\n")
.append("<SN>" +recordInfo.getSn() + "</SN>\r\n")
- .append("<DeviceID>" + recordInfo.getDeviceId() + "</DeviceID>\r\n")
+ .append("<DeviceID>" + deviceChannel.getChannelId() + "</DeviceID>\r\n")
.append("<SumNum>" + recordInfo.getSumNum() + "</SumNum>\r\n");
if (recordInfo.getRecordList() == null ) {
recordXml.append("<RecordList Num=\"0\">\r\n");
@@ -741,7 +761,7 @@
for (RecordItem recordItem : recordInfo.getRecordList()) {
recordXml.append("<Item>\r\n");
if (deviceChannel != null) {
- recordXml.append("<DeviceID>" + recordItem.getDeviceId() + "</DeviceID>\r\n")
+ recordXml.append("<DeviceID>" + deviceChannel.getChannelId() + "</DeviceID>\r\n")
.append("<Name>" + recordItem.getName() + "</Name>\r\n")
.append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(recordItem.getStartTime()) + "</StartTime>\r\n")
.append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(recordItem.getEndTime()) + "</EndTime>\r\n")
@@ -761,12 +781,14 @@
recordXml.append("</RecordList>\r\n")
.append("</Response>\r\n");
-
+ logger.info("[鍥芥爣绾ц仈] 鍙戦�佸綍鍍忔暟鎹�氶亾锛歿}, 鍐呭锛� {}", recordInfo.getChannelId(), recordXml);
// callid
CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(parentPlatform.getDeviceIp(),parentPlatform.getTransport());
Request request = headerProviderPlatformProvider.createMessageRequest(parentPlatform, recordXml.toString(), fromTag, SipUtils.getNewViaTag(), callIdHeader);
- sipSender.transmitRequest(parentPlatform.getDeviceIp(), request);
+ sipSender.transmitRequest(parentPlatform.getDeviceIp(), request, null, eventResult -> {
+ logger.info("[鍥芥爣绾ц仈] 鍙戦�佸綍鍍忔暟鎹�氶亾锛歿}, 鍙戦�佹垚鍔�", recordInfo.getChannelId());
+ });
}
@@ -806,26 +828,129 @@
}
@Override
- public void streamByeCmd(ParentPlatform parentPlatform, SendRtpItem sendRtpItem) throws SipException, InvalidArgumentException, ParseException {
+ public synchronized void streamByeCmd(ParentPlatform platform, SendRtpItem sendRtpItem) throws SipException, InvalidArgumentException, ParseException {
if (sendRtpItem == null ) {
logger.info("[鍚戜笂绾у彂閫丅YE]锛� sendRtpItem 涓篘ULL");
return;
}
- if (parentPlatform == null) {
+ if (platform == null) {
logger.info("[鍚戜笂绾у彂閫丅YE]锛� platform 涓篘ULL");
return;
}
- logger.info("[鍚戜笂绾у彂閫丅YE]锛� {}/{}", parentPlatform.getServerGBId(), sendRtpItem.getChannelId());
+ logger.info("[鍚戜笂绾у彂閫丅YE]锛� {}/{}", platform.getServerGBId(), sendRtpItem.getChannelId());
String mediaServerId = sendRtpItem.getMediaServerId();
- MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
+ MediaServer mediaServerItem = mediaServerService.getOne(mediaServerId);
if (mediaServerItem != null) {
mediaServerService.releaseSsrc(mediaServerItem.getId(), sendRtpItem.getSsrc());
- ZLMServerFactory.closeRtpServer(mediaServerItem, sendRtpItem.getStreamId());
+ mediaServerService.closeRTPServer(mediaServerItem, sendRtpItem.getStream());
}
- SIPRequest byeRequest = headerProviderPlatformProvider.createByeRequest(parentPlatform, sendRtpItem);
+ SIPRequest byeRequest = headerProviderPlatformProvider.createByeRequest(platform, sendRtpItem);
if (byeRequest == null) {
logger.warn("[鍚戜笂绾у彂閫乥ye]锛氭棤娉曞垱寤� byeRequest");
}
- sipSender.transmitRequest(parentPlatform.getDeviceIp(),byeRequest);
+ sipSender.transmitRequest(platform.getDeviceIp(),byeRequest);
+ }
+
+ @Override
+ public void streamByeCmd(ParentPlatform platform, String channelId, String stream, String callId, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException, SsrcTransactionNotFoundException {
+ SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(platform.getServerGBId(), channelId, callId, stream);
+ if (ssrcTransaction == null) {
+ throw new SsrcTransactionNotFoundException(platform.getServerGBId(), channelId, callId, stream);
+ }
+
+ mediaServerService.releaseSsrc(ssrcTransaction.getMediaServerId(), ssrcTransaction.getSsrc());
+ mediaServerService.closeRTPServer(ssrcTransaction.getMediaServerId(), ssrcTransaction.getStream());
+ streamSession.remove(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
+
+ Request byteRequest = headerProviderPlatformProvider.createByteRequest(platform, channelId, ssrcTransaction.getSipTransactionInfo());
+ sipSender.transmitRequest(sipLayer.getLocalIp(platform.getDeviceIp()), byteRequest, null, okEvent);
+ }
+
+ @Override
+ public void broadcastResultCmd(ParentPlatform platform, DeviceChannel deviceChannel, String sn, boolean result, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {
+ if (platform == null || deviceChannel == null) {
+ return;
+ }
+ String characterSet = platform.getCharacterSet();
+ StringBuffer mediaStatusXml = new StringBuffer(200);
+ mediaStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
+ mediaStatusXml.append("<Response>\r\n");
+ mediaStatusXml.append("<CmdType>Broadcast</CmdType>\r\n");
+ mediaStatusXml.append("<SN>" + sn + "</SN>\r\n");
+ mediaStatusXml.append("<DeviceID>" + deviceChannel.getChannelId() + "</DeviceID>\r\n");
+ mediaStatusXml.append("<Result>" + (result?"OK":"ERROR") + "</Result>\r\n");
+ mediaStatusXml.append("</Response>\r\n");
+
+ CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(platform.getDeviceIp(), platform.getTransport());
+
+ SIPRequest messageRequest = (SIPRequest)headerProviderPlatformProvider.createMessageRequest(platform, mediaStatusXml.toString(),
+ SipUtils.getNewFromTag(), SipUtils.getNewViaTag(), callIdHeader);
+
+ sipSender.transmitRequest(platform.getDeviceIp(),messageRequest, errorEvent, okEvent);
+ }
+
+ @Override
+ public void broadcastInviteCmd(ParentPlatform platform, String channelId, MediaServer mediaServerItem,
+ SSRCInfo ssrcInfo, HookSubscribe.Event event, SipSubscribe.Event okEvent,
+ SipSubscribe.Event errorEvent) throws ParseException, SipException, InvalidArgumentException {
+ String stream = ssrcInfo.getStream();
+
+ if (platform == null) {
+ return;
+ }
+
+ logger.info("{} 鍒嗛厤鐨刏LM涓�: {} [{}:{}]", stream, mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());
+ Hook hook = Hook.getInstance(HookType.on_media_arrival, "rtp", stream, mediaServerItem.getId());
+ subscribe.addSubscribe(hook, (hookData) -> {
+ if (event != null) {
+ event.response(hookData);
+ subscribe.removeSubscribe(hook);
+ }
+ });
+ String sdpIp = mediaServerItem.getSdpIp();
+
+ StringBuffer content = new StringBuffer(200);
+ content.append("v=0\r\n");
+ content.append("o=" + channelId + " 0 0 IN IP4 " + sdpIp + "\r\n");
+ content.append("s=Play\r\n");
+ content.append("c=IN IP4 " + sdpIp + "\r\n");
+ content.append("t=0 0\r\n");
+
+ if ("TCP-PASSIVE".equalsIgnoreCase(userSetting.getBroadcastForPlatform())) {
+ content.append("m=audio " + ssrcInfo.getPort() + " TCP/RTP/AVP 8 96\r\n");
+ } else if ("TCP-ACTIVE".equalsIgnoreCase(userSetting.getBroadcastForPlatform())) {
+ content.append("m=audio " + ssrcInfo.getPort() + " TCP/RTP/AVP 8 96\r\n");
+ } else if ("UDP".equalsIgnoreCase(userSetting.getBroadcastForPlatform())) {
+ content.append("m=audio " + ssrcInfo.getPort() + " RTP/AVP 8 96\r\n");
+ }
+
+ content.append("a=recvonly\r\n");
+ content.append("a=rtpmap:8 PCMA/8000\r\n");
+ content.append("a=rtpmap:96 PS/90000\r\n");
+ if ("TCP-PASSIVE".equalsIgnoreCase(userSetting.getBroadcastForPlatform())) {
+ content.append("a=setup:passive\r\n");
+ content.append("a=connection:new\r\n");
+ }else if ("TCP-ACTIVE".equalsIgnoreCase(userSetting.getBroadcastForPlatform())) {
+ content.append("a=setup:active\r\n");
+ content.append("a=connection:new\r\n");
+ }
+
+ content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc
+ CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(sipLayer.getLocalIp(platform.getDeviceIp()), platform.getTransport());
+
+ Request request = headerProviderPlatformProvider.createInviteRequest(platform, channelId,
+ content.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), ssrcInfo.getSsrc(),
+ callIdHeader);
+ sipSender.transmitRequest(sipLayer.getLocalIp(platform.getDeviceIp()), request, (e -> {
+ streamSession.remove(platform.getServerGBId(), channelId, ssrcInfo.getStream());
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+ subscribe.removeSubscribe(hook);
+ errorEvent.response(e);
+ }), e -> {
+ ResponseEvent responseEvent = (ResponseEvent) e.event;
+ SIPResponse response = (SIPResponse) responseEvent.getResponse();
+ streamSession.put(platform.getServerGBId(), channelId, callIdHeader.getCallId(), stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), response, InviteSessionType.BROADCAST);
+ okEvent.response(e);
+ });
}
}
--
Gitblit v1.8.0