From d5f26faf15ec2b9fbbd5225d86297364b48876b7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 14 二月 2023 11:29:22 +0800
Subject: [PATCH] 优化语音对讲级联，目前等待zlm支持openRTPServer仅收音频
---
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java | 103 +++++++++++++--------------------------------------
1 files changed, 26 insertions(+), 77 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 f61ae09..1bd9850 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
@@ -1,22 +1,20 @@
package com.genersoft.iot.vmp.gb28181.session;
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
+import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
+import com.genersoft.iot.vmp.utils.JsonUtil;
+import com.genersoft.iot.vmp.utils.redis.RedisUtil;
+import gov.nist.javax.sip.message.SIPResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+
import java.util.ArrayList;
import java.util.List;
-import javax.sip.ClientTransaction;
-import javax.sip.Dialog;
-
-import com.genersoft.iot.vmp.common.VideoManagerConstants;
-import com.genersoft.iot.vmp.conf.UserSetting;
-import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
-import com.genersoft.iot.vmp.utils.SerializeUtils;
-import com.genersoft.iot.vmp.utils.redis.RedisUtil;
-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绠＄悊鍣紝绠＄悊瑙嗛棰勮銆侀瑙堝洖鏀剧殑閫氫俊鍙ユ焺
* @author: swwheihei
* @date: 2020骞�5鏈�13鏃� 涓嬪崍4:03:02
@@ -30,7 +28,8 @@
public enum SessionType {
play,
playback,
- download
+ download,
+ broadcast
}
/**
@@ -41,15 +40,14 @@
* @param callId 涓�娆¤姹傜殑CallID
* @param stream 娴佸悕绉�
* @param mediaServerId 鎵�浣跨敤鐨勬祦濯掍綋ID
- * @param transaction 浜嬪姟
+ * @param response 鍥炲
*/
- public void put(String deviceId, String channelId, String callId, String stream, String ssrc, String mediaServerId, ClientTransaction transaction, SessionType type){
+ public void put(String deviceId, String channelId, String callId, String stream, String ssrc, String mediaServerId, SIPResponse response, SessionType type){
SsrcTransaction ssrcTransaction = new SsrcTransaction();
ssrcTransaction.setDeviceId(deviceId);
ssrcTransaction.setChannelId(channelId);
ssrcTransaction.setStream(stream);
- byte[] transactionByteArray = SerializeUtils.serialize(transaction);
- ssrcTransaction.setTransaction(transactionByteArray);
+ ssrcTransaction.setSipTransactionInfo(new SipTransactionInfo(response));
ssrcTransaction.setCallId(callId);
ssrcTransaction.setSsrc(ssrc);
ssrcTransaction.setMediaServerId(mediaServerId);
@@ -57,69 +55,20 @@
RedisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId()
+ "_" + deviceId + "_" + channelId + "_" + callId + "_" + stream, ssrcTransaction);
- RedisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId()
- + "_" + deviceId + "_" + channelId + "_" + callId + "_" + stream, ssrcTransaction);
- }
-
- 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 + userSetting.getServerId()
- + "_" + deviceId + "_" + channelId + "_" + ssrcTransaction.getCallId() + "_"
- + ssrcTransaction.getStream(), ssrcTransaction);
- }
-
-
- public ClientTransaction getTransaction(String deviceId, String channelId, String stream, String callId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, callId, stream);
- if (ssrcTransaction == null) {
- return null;
- }
- byte[] transactionByteArray = ssrcTransaction.getTransaction();
- ClientTransaction clientTransaction = (ClientTransaction)SerializeUtils.deSerialize(transactionByteArray);
- return clientTransaction;
- }
-
- 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;
- }
- SIPDialog dialog = (SIPDialog)SerializeUtils.deSerialize(dialogByteArray);
- return dialog;
- }
-
- public SIPDialog getDialogByCallId(String deviceId, String channelId, String callId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, callId, null);
- if (ssrcTransaction == null) {
- return null;
- }
- byte[] dialogByteArray = ssrcTransaction.getDialog();
- if (dialogByteArray == null) {
- return null;
- }
- return (SIPDialog)SerializeUtils.deSerialize(dialogByteArray);
}
public SsrcTransaction getSsrcTransaction(String deviceId, String channelId, String callId, String stream){
- if (StringUtils.isEmpty(deviceId)) {
+ if (ObjectUtils.isEmpty(deviceId)) {
deviceId ="*";
}
- if (StringUtils.isEmpty(channelId)) {
+ if (ObjectUtils.isEmpty(channelId)) {
channelId ="*";
}
- if (StringUtils.isEmpty(callId)) {
+ if (ObjectUtils.isEmpty(callId)) {
callId ="*";
}
- if (StringUtils.isEmpty(stream)) {
+ if (ObjectUtils.isEmpty(stream)) {
stream ="*";
}
String key = VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId() + "_" + deviceId + "_" + channelId + "_" + callId+ "_" + stream;
@@ -131,16 +80,16 @@
}
public List<SsrcTransaction> getSsrcTransactionForAll(String deviceId, String channelId, String callId, String stream){
- if (StringUtils.isEmpty(deviceId)) {
+ if (ObjectUtils.isEmpty(deviceId)) {
deviceId ="*";
}
- if (StringUtils.isEmpty(channelId)) {
+ if (ObjectUtils.isEmpty(channelId)) {
channelId ="*";
}
- if (StringUtils.isEmpty(callId)) {
+ if (ObjectUtils.isEmpty(callId)) {
callId ="*";
}
- if (StringUtils.isEmpty(stream)) {
+ if (ObjectUtils.isEmpty(stream)) {
stream ="*";
}
String key = VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId() + "_" + deviceId + "_" + channelId + "_" + callId+ "_" + stream;
@@ -186,7 +135,7 @@
List<SsrcTransaction> result= new ArrayList<>();
for (int i = 0; i < ssrcTransactionKeys.size(); i++) {
String key = (String)ssrcTransactionKeys.get(i);
- SsrcTransaction ssrcTransaction = (SsrcTransaction)RedisUtil.get(key);
+ SsrcTransaction ssrcTransaction = JsonUtil.redisJsonToObject(key, SsrcTransaction.class);
result.add(ssrcTransaction);
}
return result;
--
Gitblit v1.8.0