From 2eb1ca2d94a09c2d3ced69de28de72d2d6d77d8e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 03 三月 2022 15:57:28 +0800
Subject: [PATCH] 国标录像支持多端同时播放
---
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java | 70 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
index d41b04d..3e9f28a 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
@@ -14,6 +14,7 @@
import gov.nist.javax.sip.stack.SIPDialog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
/**
* @description:瑙嗛娴乻ession绠＄悊鍣紝绠＄悊瑙嗛棰勮銆侀瑙堝洖鏀剧殑閫氫俊鍙ユ焺
@@ -29,39 +30,55 @@
@Autowired
private UserSetup userSetup;
- public void put(String deviceId, String channelId ,String ssrc, String streamId, String mediaServerId, ClientTransaction transaction){
+ /**
+ * 娣诲姞涓�涓偣鎾�/鍥炴斁鐨勪簨鍔′俊鎭�
+ * 鍚庣画鍙互閫氳繃娴両d/callID
+ * @param deviceId 璁惧ID
+ * @param channelId 閫氶亾ID
+ * @param callId 涓�娆¤姹傜殑CallID
+ * @param stream 娴佸悕绉�
+ * @param mediaServerId 鎵�浣跨敤鐨勬祦濯掍綋ID
+ * @param transaction 浜嬪姟
+ */
+ public void put(String deviceId, String channelId, String callId, String stream, String ssrc, String mediaServerId, ClientTransaction transaction){
SsrcTransaction ssrcTransaction = new SsrcTransaction();
ssrcTransaction.setDeviceId(deviceId);
ssrcTransaction.setChannelId(channelId);
- ssrcTransaction.setStreamId(streamId);
+ ssrcTransaction.setStream(stream);
byte[] transactionByteArray = SerializeUtils.serialize(transaction);
ssrcTransaction.setTransaction(transactionByteArray);
+ ssrcTransaction.setCallId(callId);
ssrcTransaction.setSsrc(ssrc);
ssrcTransaction.setMediaServerId(mediaServerId);
- redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId() + "_" + deviceId + "_" + channelId, ssrcTransaction);
+ redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId()
+ + "_" + deviceId + "_" + channelId + "_" + callId + "_" + stream, ssrcTransaction);
+ redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId()
+ + "_" + deviceId + "_" + channelId + "_" + callId + "_" + stream, ssrcTransaction);
}
- public void put(String deviceId, String channelId , Dialog dialog){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
+ public void put(String deviceId, String channelId, String callId, Dialog dialog){
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, callId, null);
if (ssrcTransaction != null) {
byte[] dialogByteArray = SerializeUtils.serialize(dialog);
ssrcTransaction.setDialog(dialogByteArray);
}
- redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId() + "_" + deviceId + "_" + channelId, ssrcTransaction);
+ redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId()
+ + "_" + deviceId + "_" + channelId + "_" + ssrcTransaction.getCallId() + "_"
+ + ssrcTransaction.getStream(), ssrcTransaction);
}
- public ClientTransaction getTransaction(String deviceId, String channelId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
+ public ClientTransaction getTransactionByStream(String deviceId, String channelId, String stream){
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
if (ssrcTransaction == null) return null;
byte[] transactionByteArray = ssrcTransaction.getTransaction();
ClientTransaction clientTransaction = (ClientTransaction)SerializeUtils.deSerialize(transactionByteArray);
return clientTransaction;
}
- public SIPDialog getDialog(String deviceId, String channelId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
+ public SIPDialog getDialogByStream(String deviceId, String channelId, String stream){
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
if (ssrcTransaction == null) return null;
byte[] dialogByteArray = ssrcTransaction.getDialog();
if (dialogByteArray == null) return null;
@@ -69,36 +86,37 @@
return dialog;
}
- public SsrcTransaction getSsrcTransaction(String deviceId, String channelId){
- SsrcTransaction ssrcTransaction = (SsrcTransaction)redisUtil.get(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId() + "_" + deviceId + "_" + channelId);
- return ssrcTransaction;
+ public SsrcTransaction getSsrcTransaction(String deviceId, String channelId, String callId, String stream){
+ if (StringUtils.isEmpty(callId)) callId ="*";
+ if (StringUtils.isEmpty(stream)) stream ="*";
+ String key = VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId() + "_" + deviceId + "_" + channelId + "_" + callId+ "_" + stream;
+ List<Object> scanResult = redisUtil.scan(key);
+ if (scanResult.size() == 0) return null;
+ return (SsrcTransaction)redisUtil.get((String) scanResult.get(0));
}
- public String getStreamId(String deviceId, String channelId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
- if (ssrcTransaction == null) return null;
- return ssrcTransaction.getStreamId();
- }
- public String getMediaServerId(String deviceId, String channelId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
+ public String getMediaServerId(String deviceId, String channelId, String stream){
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
if (ssrcTransaction == null) return null;
return ssrcTransaction.getMediaServerId();
}
- public String getSSRC(String deviceId, String channelId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
+ public String getSSRC(String deviceId, String channelId, String stream){
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
if (ssrcTransaction == null) return null;
return ssrcTransaction.getSsrc();
}
- public void remove(String deviceId, String channelId) {
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
+ public void remove(String deviceId, String channelId, String stream) {
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
if (ssrcTransaction == null) return;
- redisUtil.del(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId() + "_" + deviceId + "_" + channelId);
+ redisUtil.del(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId() + "_"
+ + deviceId + "_" + channelId + "_" + ssrcTransaction.getCallId() + "_" + ssrcTransaction.getStream());
}
+
public List<SsrcTransaction> getAllSsrc() {
- List<Object> ssrcTransactionKeys = redisUtil.scan(String.format("%s_*_*", VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX+ userSetup.getServerId() + "_" ));
+ List<Object> ssrcTransactionKeys = redisUtil.scan(String.format("%s_*_*_*_*", VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX+ userSetup.getServerId() + "_" ));
List<SsrcTransaction> result= new ArrayList<>();
for (int i = 0; i < ssrcTransactionKeys.size(); i++) {
String key = (String)ssrcTransactionKeys.get(i);
--
Gitblit v1.8.0