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 | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 025f347..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
@@ -204,28 +204,33 @@
// case download:
// break;
case broadcast:
- String deviceId = ssrcTransaction.getDeviceId();
String channelId1 = ssrcTransaction.getChannelId();
- Device deviceFromTransaction = storager.queryVideoDevice(deviceId);
+ Device deviceFromTransaction = storager.queryVideoDevice(ssrcTransaction.getDeviceId());
if (deviceFromTransaction == null) {
- ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(deviceId);
+ ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(ssrcTransaction.getDeviceId());
if (parentPlatform != null) {
// 鏉ヨ嚜涓婄骇骞冲彴鐨勫仠姝㈠璁�
+ logger.info("[鍋滄瀵硅] 鏉ヨ嚜涓婄骇锛屽钩鍙帮細{}, 閫氶亾锛歿}", ssrcTransaction.getDeviceId(), channelId1);
// 閲婃斁ssrc
- MediaServerItem mediaServerItemFromTransaction = mediaServerService.getOne(ssrcTransaction.getMediaServerId());
- if (mediaServerItemFromTransaction != null) {
- mediaServerService.releaseSsrc(mediaServerItemFromTransaction.getId(), ssrcTransaction.getSsrc());
- }
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(deviceId, channelId1);
+ AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(ssrcTransaction.getDeviceId(), channelId1);
if (audioBroadcastCatch != null) {
//
- SendRtpItem sendRtpItemForBroadcast = redisCatchStorage.querySendRTPServer(deviceId, channelId1,
+ SendRtpItem sendRtpItemForBroadcast = redisCatchStorage.querySendRTPServer(ssrcTransaction.getDeviceId(), channelId1,
audioBroadcastCatch.getStream(), audioBroadcastCatch.getSipTransactionInfo().getCallId());
if (sendRtpItemForBroadcast != null) {
MediaServerItem mediaServerItemForBroadcast = mediaServerService.getOne(sendRtpItem.getMediaServerId());
@@ -257,6 +262,7 @@
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());
@@ -273,14 +279,13 @@
}
}
- redisCatchStorage.deleteSendRTPServer(deviceId, channelId1,
+ redisCatchStorage.deleteSendRTPServer(ssrcTransaction.getDeviceId(), channelId1,
audioBroadcastCatch.getStream(), audioBroadcastCatch.getSipTransactionInfo().getCallId());
}
-
- audioBroadcastManager.del(deviceId, channelId1);
}
}
+ audioBroadcastManager.del(ssrcTransaction.getDeviceId(), channelId1);
break;
default:
break;
--
Gitblit v1.8.0