From 455e58f866d7f538422f50362137d9759dc58768 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 21 三月 2023 14:21:45 +0800
Subject: [PATCH] 优化合并对讲broadcast级联模式
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java | 88 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 82 insertions(+), 6 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 86c2c78..025f347 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
@@ -2,14 +2,12 @@
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.InviteStreamType;
-import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
-import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
+import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;
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;
@@ -37,6 +35,7 @@
import javax.sip.message.Response;
import java.text.ParseException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -50,6 +49,9 @@
@Autowired
private ISIPCommander cmder;
+
+ @Autowired
+ private ISIPCommanderForPlatform commanderForPlatform;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -204,12 +206,86 @@
case broadcast:
String deviceId = ssrcTransaction.getDeviceId();
String channelId1 = ssrcTransaction.getChannelId();
- // 濡傛灉鏄�
+
+ Device deviceFromTransaction = storager.queryVideoDevice(deviceId);
+ if (deviceFromTransaction == null) {
+ ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(deviceId);
+ if (parentPlatform != null) {
+ // 鏉ヨ嚜涓婄骇骞冲彴鐨勫仠姝㈠璁�
+ // 閲婃斁ssrc
+ MediaServerItem mediaServerItemFromTransaction = mediaServerService.getOne(ssrcTransaction.getMediaServerId());
+ if (mediaServerItemFromTransaction != null) {
+ mediaServerService.releaseSsrc(mediaServerItemFromTransaction.getId(), ssrcTransaction.getSsrc());
+ }
+ streamSession.remove(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
+ }
+ }else {
+ // 鏉ヨ嚜璁惧鐨勫仠姝㈠璁�
+ // 濡傛灉鏄潵鑷澶囷紝鍒欏惉鍋滄鎺ㄦ祦銆� 鏉ヨ嚜涓婄骇鍒欏仠姝㈡敹娴�
+ AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(deviceId, channelId1);
+ if (audioBroadcastCatch != null) {
+ //
+ SendRtpItem sendRtpItemForBroadcast = redisCatchStorage.querySendRTPServer(deviceId, 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());
+ });
+ } 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(deviceId, channelId1,
+ audioBroadcastCatch.getStream(), audioBroadcastCatch.getSipTransactionInfo().getCallId());
+
+ }
+
+ audioBroadcastManager.del(deviceId, channelId1);
+ }
+ }
break;
default:
break;
}
- streamSession.remove(device.getDeviceId(), channelId, ssrcTransaction.getStream());
+
}
}
}
--
Gitblit v1.8.0