From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java | 98 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
index 30193d2..55f09df 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
@@ -1,5 +1,9 @@
package com.genersoft.iot.vmp.gb28181.bean;
+import com.genersoft.iot.vmp.service.bean.RequestPushStreamMsg;
+
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
+
public class SendRtpItem {
/**
@@ -21,6 +25,11 @@
* 骞冲彴id
*/
private String platformId;
+
+ /**
+ * 骞冲彴鍚嶇О
+ */
+ private String platformName;
/**
* 瀵瑰簲璁惧id
@@ -62,6 +71,11 @@
private boolean tcpActive;
/**
+ * 鑷繁鎺ㄦ祦浣跨敤鐨処P
+ */
+ private String localIp;
+
+ /**
* 鑷繁鎺ㄦ祦浣跨敤鐨勭鍙�
*/
private int localPort;
@@ -79,7 +93,7 @@
/**
* invite 鐨� callId
*/
- private String CallId;
+ private String callId;
/**
* invite 鐨� fromTag
@@ -121,6 +135,44 @@
* 鍙戞祦鐨勫悓鏃舵敹娴�
*/
private String receiveStream;
+
+ /**
+ * 涓婄骇鐨勭偣鎾被鍨�
+ */
+ private String sessionName;
+
+ public static SendRtpItem getInstance(RequestPushStreamMsg requestPushStreamMsg) {
+ SendRtpItem sendRtpItem = new SendRtpItem();
+ sendRtpItem.setMediaServerId(requestPushStreamMsg.getMediaServerId());
+ sendRtpItem.setApp(requestPushStreamMsg.getApp());
+ sendRtpItem.setStream(requestPushStreamMsg.getStream());
+ sendRtpItem.setIp(requestPushStreamMsg.getIp());
+ sendRtpItem.setPort(requestPushStreamMsg.getPort());
+ sendRtpItem.setSsrc(requestPushStreamMsg.getSsrc());
+ sendRtpItem.setTcp(requestPushStreamMsg.isTcp());
+ sendRtpItem.setLocalPort(requestPushStreamMsg.getSrcPort());
+ sendRtpItem.setPt(requestPushStreamMsg.getPt());
+ sendRtpItem.setUsePs(requestPushStreamMsg.isPs());
+ sendRtpItem.setOnlyAudio(requestPushStreamMsg.isOnlyAudio());
+ return sendRtpItem;
+
+ }
+
+ public static SendRtpItem getInstance(String app, String stream, String ssrc, String dstIp, Integer dstPort, boolean tcp, int sendLocalPort, Integer pt) {
+ SendRtpItem sendRtpItem = new SendRtpItem();
+ sendRtpItem.setApp(app);
+ sendRtpItem.setStream(stream);
+ sendRtpItem.setSsrc(ssrc);
+ sendRtpItem.setTcp(tcp);
+ sendRtpItem.setLocalPort(sendLocalPort);
+ sendRtpItem.setIp(dstIp);
+ sendRtpItem.setPort(dstPort);
+ if (pt != null) {
+ sendRtpItem.setPt(pt);
+ }
+
+ return sendRtpItem;
+ }
public String getIp() {
return ip;
@@ -227,11 +279,11 @@
}
public String getCallId() {
- return CallId;
+ return callId;
}
public void setCallId(String callId) {
- CallId = callId;
+ this.callId = callId;
}
public InviteStreamType getPlayType() {
@@ -306,6 +358,30 @@
this.receiveStream = receiveStream;
}
+ public String getPlatformName() {
+ return platformName;
+ }
+
+ public void setPlatformName(String platformName) {
+ this.platformName = platformName;
+ }
+
+ public String getLocalIp() {
+ return localIp;
+ }
+
+ public void setLocalIp(String localIp) {
+ this.localIp = localIp;
+ }
+
+ public String getSessionName() {
+ return sessionName;
+ }
+
+ public void setSessionName(String sessionName) {
+ this.sessionName = sessionName;
+ }
+
@Override
public String toString() {
return "SendRtpItem{" +
@@ -313,6 +389,7 @@
", port=" + port +
", ssrc='" + ssrc + '\'' +
", platformId='" + platformId + '\'' +
+ ", platformName='" + platformName + '\'' +
", deviceId='" + deviceId + '\'' +
", app='" + app + '\'' +
", channelId='" + channelId + '\'' +
@@ -320,10 +397,11 @@
", stream='" + stream + '\'' +
", tcp=" + tcp +
", tcpActive=" + tcpActive +
+ ", localIp='" + localIp + '\'' +
", localPort=" + localPort +
", mediaServerId='" + mediaServerId + '\'' +
", serverId='" + serverId + '\'' +
- ", CallId='" + CallId + '\'' +
+ ", CallId='" + callId + '\'' +
", fromTag='" + fromTag + '\'' +
", toTag='" + toTag + '\'' +
", pt=" + pt +
@@ -332,6 +410,18 @@
", rtcp=" + rtcp +
", playType=" + playType +
", receiveStream='" + receiveStream + '\'' +
+ ", sessionName='" + sessionName + '\'' +
'}';
}
+
+ public String getRedisKey() {
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX +
+ serverId + "_"
+ + mediaServerId + "_"
+ + platformId + "_"
+ + channelId + "_"
+ + stream + "_"
+ + callId;
+ return key;
+ }
}
--
Gitblit v1.8.0