From 82adc0cb23f3ee47322e78889cdaba57e9309000 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 21 三月 2023 15:55:24 +0800
Subject: [PATCH] 完善语音对讲级联
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java | 130 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 122 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
index 5758d23..202d1c6 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
@@ -7,6 +7,7 @@
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
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.ZLMRTPServerFactory;
@@ -24,15 +25,17 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import javax.sip.*;
+import javax.sip.InvalidArgumentException;
+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 javax.sip.message.Response;
import java.text.ParseException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -46,6 +49,9 @@
@Autowired
private ISIPCommander cmder;
+
+ @Autowired
+ private ISIPCommanderForPlatform commanderForPlatform;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -87,13 +93,15 @@
@Override
public void process(RequestEvent evt) {
+ // TODO 姝ゅ闇�瑕侀噸鏋�
+ SIPRequest request =(SIPRequest) evt.getRequest();
try {
- responseAck((SIPRequest) evt.getRequest(), Response.OK);
+ responseAck(request, Response.OK);
} catch (SipException | InvalidArgumentException | ParseException e) {
logger.error("[鍥炲BYE淇℃伅澶辫触]锛寋}", e.getMessage());
}
- CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
- SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(null, null, null, callIdHeader.getCallId());
+
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(null, null, null, request.getCallIdHeader().getCallId());
if (sendRtpItem != null){
logger.info("[鏀跺埌bye] {}/{}", sendRtpItem.getPlatformId(), sendRtpItem.getChannelId());
@@ -115,7 +123,7 @@
param.put("ssrc",sendRtpItem.getSsrc());
logger.info("[鏀跺埌bye] 鍋滄鎺ㄦ祦锛歿}", streamId);
MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
- redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(), callIdHeader.getCallId(), null);
+ redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(), request.getCallIdHeader().getCallId(), null);
zlmrtpServerFactory.stopSendRtpStream(mediaInfo, param);
int totalReaderCount = zlmrtpServerFactory.totalReaderCount(mediaInfo, sendRtpItem.getApp(), streamId);
@@ -159,7 +167,7 @@
}
SsrcTransaction ssrcTransactionForPlay = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, "play", null);
if (ssrcTransactionForPlay != null){
- if (ssrcTransactionForPlay.getCallId().equals(callIdHeader.getCallId())){
+ if (ssrcTransactionForPlay.getCallId().equals(request.getCallIdHeader().getCallId())){
// 閲婃斁ssrc
MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransactionForPlay.getMediaServerId());
if (mediaServerItem != null) {
@@ -168,7 +176,7 @@
streamSession.remove(device.getDeviceId(), channelId, ssrcTransactionForPlay.getStream());
}
}
- SsrcTransaction ssrcTransactionForPlayBack = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, callIdHeader.getCallId(), null);
+ SsrcTransaction ssrcTransactionForPlayBack = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, request.getCallIdHeader().getCallId(), null);
if (ssrcTransactionForPlayBack != null) {
// 閲婃斁ssrc
MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransactionForPlayBack.getMediaServerId());
@@ -178,5 +186,111 @@
streamSession.remove(device.getDeviceId(), channelId, ssrcTransactionForPlayBack.getStream());
}
}
+ SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(null, null, request.getCallIdHeader().getCallId(), null);
+ if (ssrcTransaction != null) {
+ // 閲婃斁ssrc
+ MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransaction.getMediaServerId());
+ if (mediaServerItem != null) {
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcTransaction.getSsrc());
+ }
+
+ switch (ssrcTransaction.getType()) {
+// case play:
+// break;
+// case talk:
+// break;
+// case playback:
+// break;
+// case download:
+// break;
+ case broadcast:
+ String channelId1 = ssrcTransaction.getChannelId();
+
+ Device deviceFromTransaction = storager.queryVideoDevice(ssrcTransaction.getDeviceId());
+ if (deviceFromTransaction == null) {
+ ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(ssrcTransaction.getDeviceId());
+ if (parentPlatform != null) {
+ // 鏉ヨ嚜涓婄骇骞冲彴鐨勫仠姝㈠璁�
+ logger.info("[鍋滄瀵硅] 鏉ヨ嚜涓婄骇锛屽钩鍙帮細{}, 閫氶亾锛歿}", ssrcTransaction.getDeviceId(), channelId1);
+ // 閲婃斁ssrc
+ streamSession.remove(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
+ if (mediaServerItem != null) {
+ zlmrtpServerFactory.closeRtpServer(mediaServerItem, ssrcTransaction.getStream());
+ }
+ // 鏌ユ壘鏉ユ簮鐨勫璁茶澶囷紝鍙戦�佸仠姝�
+ Device sourceDevice = storager.queryVideoDeviceByPlatformIdAndChannelId(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId());
+ if (sourceDevice != null) {
+ playService.stopAudioBroadcast(sourceDevice.getDeviceId(), channelId);
+ }
+ }
+ }else {
+ // 鏉ヨ嚜璁惧鐨勫仠姝㈠璁�
+
+ // 濡傛灉鏄潵鑷澶囷紝鍒欏惉鍋滄鎺ㄦ祦銆� 鏉ヨ嚜涓婄骇鍒欏仠姝㈡敹娴�
+ AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(ssrcTransaction.getDeviceId(), channelId1);
+ if (audioBroadcastCatch != null) {
+ //
+ SendRtpItem sendRtpItemForBroadcast = redisCatchStorage.querySendRTPServer(ssrcTransaction.getDeviceId(), channelId1,
+ audioBroadcastCatch.getStream(), audioBroadcastCatch.getSipTransactionInfo().getCallId());
+ if (sendRtpItemForBroadcast != null) {
+ MediaServerItem mediaServerItemForBroadcast = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ if (mediaServerItemForBroadcast == null) {
+ return;
+ }
+
+ Boolean ready = zlmrtpServerFactory.isStreamReady(mediaServerItem, sendRtpItem.getApp(), audioBroadcastCatch.getStream());
+ if (ready) {
+ Map<String, Object> param = new HashMap<>();
+ param.put("vhost","__defaultVhost__");
+ param.put("app",sendRtpItem.getApp());
+ param.put("stream",audioBroadcastCatch.getStream());
+ param.put("ssrc",sendRtpItem.getSsrc());
+ logger.info("[鏀跺埌bye] 鍋滄鎺ㄦ祦锛歿}", audioBroadcastCatch.getStream());
+ MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
+ redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(), request.getCallIdHeader().getCallId(), null);
+ zlmrtpServerFactory.stopSendRtpStream(mediaInfo, param);
+ }
+ if (audioBroadcastCatch.isFromPlatform()) {
+ // 涓婄骇涔熸鍦ㄧ偣鎾�� 鍚戜笂绾у洖澶峛ye
+ List<SsrcTransaction> ssrcTransactions = streamSession.getSsrcTransactionForAll(null, channelId1, null, null);
+ if (ssrcTransactions.size() > 0) {
+ for (SsrcTransaction transaction : ssrcTransactions) {
+ if (transaction.getType().equals(VideoStreamSessionManager.SessionType.broadcast)) {
+ ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(transaction.getDeviceId());
+ if (parentPlatform != null) {
+ try {
+ commanderForPlatform.streamByeCmd(parentPlatform, channelId1, transaction.getStream(), transaction.getCallId(), eventResult -> {
+ streamSession.remove(transaction.getDeviceId(), transaction.getChannelId(), transaction.getStream());
+ });
+ audioBroadcastManager.del(transaction.getDeviceId(), channelId1);
+ } catch (InvalidArgumentException | SipException | ParseException |
+ SsrcTransactionNotFoundException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍚憑}鍙戦�乥ye澶辫触", transaction.getDeviceId());
+ }
+ // 閲婃斁ssrc
+ MediaServerItem mediaServerItemFromTransaction = mediaServerService.getOne(transaction.getMediaServerId());
+ if (mediaServerItemFromTransaction != null) {
+ mediaServerService.releaseSsrc(mediaServerItemFromTransaction.getId(), transaction.getSsrc());
+ }
+ streamSession.remove(transaction.getDeviceId(), transaction.getChannelId(), transaction.getStream());
+ }
+ }
+ }
+ }
+
+ }
+ redisCatchStorage.deleteSendRTPServer(ssrcTransaction.getDeviceId(), channelId1,
+ audioBroadcastCatch.getStream(), audioBroadcastCatch.getSipTransactionInfo().getCallId());
+
+ }
+ }
+ }
+ audioBroadcastManager.del(ssrcTransaction.getDeviceId(), channelId1);
+ break;
+ default:
+ break;
+ }
+
+ }
}
}
--
Gitblit v1.8.0