From b1b6fae22c5ab3013d73df1a43cd42f7fe0fa347 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 四月 2024 10:35:11 +0800
Subject: [PATCH] Merge branch 'master' into dev/zlm
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java | 146 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 129 insertions(+), 17 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
old mode 100644
new mode 100755
index 4b63ec5..30193d2
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
@@ -49,7 +49,7 @@
/**
* 璁惧鎺ㄦ祦鐨剆treamId
*/
- private String streamId;
+ private String stream;
/**
* 鏄惁涓簍cp
@@ -72,18 +72,55 @@
private String mediaServerId;
/**
- * invite鐨刢allId
+ * 浣跨敤鐨勬湇鍔＄殑ID
+ */
+ private String serverId;
+
+ /**
+ * invite 鐨� callId
*/
private String CallId;
+
+ /**
+ * invite 鐨� fromTag
+ */
+ private String fromTag;
+
+ /**
+ * invite 鐨� toTag
+ */
+ private String toTag;
+
+ /**
+ * 鍙戦�佹椂锛宺tp鐨刾t锛坲int8_t锛�,涓嶄紶鏃堕粯璁や负96
+ */
+ private int pt = 96;
+
+ /**
+ * 鍙戦�佹椂锛宺tp鐨勮礋杞界被鍨嬨�備负true鏃讹紝璐熻浇涓簆s锛涗负false鏃讹紝涓篹s锛�
+ */
+ private boolean usePs = true;
+
+ /**
+ * 褰搖sePs 涓篺alse鏃讹紝鏈夋晥銆備负1鏃讹紝鍙戦�侀煶棰戯紱涓�0鏃讹紝鍙戦�佽棰戯紱涓嶄紶鏃堕粯璁や负0
+ */
+ private boolean onlyAudio = false;
+
+ /**
+ * 鏄惁寮�鍚痳tcp淇濇椿
+ */
+ private boolean rtcp = false;
+
/**
* 鎾斁绫诲瀷
*/
private InviteStreamType playType;
- private byte[] transaction;
-
- private byte[] dialog;
+ /**
+ * 鍙戞祦鐨勫悓鏃舵敹娴�
+ */
+ private String receiveStream;
public String getIp() {
return ip;
@@ -149,12 +186,12 @@
this.app = app;
}
- public String getStreamId() {
- return streamId;
+ public String getStream() {
+ return stream;
}
- public void setStreamId(String streamId) {
- this.streamId = streamId;
+ public void setStream(String stream) {
+ this.stream = stream;
}
public boolean isTcp() {
@@ -205,21 +242,96 @@
this.playType = playType;
}
- public byte[] getTransaction() {
- return transaction;
+ public int getPt() {
+ return pt;
}
- public void setTransaction(byte[] transaction) {
- this.transaction = transaction;
+ public void setPt(int pt) {
+ this.pt = pt;
}
- public byte[] getDialog() {
- return dialog;
+ public boolean isUsePs() {
+ return usePs;
}
- public void setDialog(byte[] dialog) {
- this.dialog = dialog;
+ public void setUsePs(boolean usePs) {
+ this.usePs = usePs;
}
+ public boolean isOnlyAudio() {
+ return onlyAudio;
+ }
+ public void setOnlyAudio(boolean onlyAudio) {
+ this.onlyAudio = onlyAudio;
+ }
+
+ public String getServerId() {
+ return serverId;
+ }
+
+ public void setServerId(String serverId) {
+ this.serverId = serverId;
+ }
+
+ public String getFromTag() {
+ return fromTag;
+ }
+
+ public void setFromTag(String fromTag) {
+ this.fromTag = fromTag;
+ }
+
+ public String getToTag() {
+ return toTag;
+ }
+
+ public void setToTag(String toTag) {
+ this.toTag = toTag;
+ }
+
+ public boolean isRtcp() {
+ return rtcp;
+ }
+
+ public void setRtcp(boolean rtcp) {
+ this.rtcp = rtcp;
+ }
+
+ public String getReceiveStream() {
+ return receiveStream;
+ }
+
+ public void setReceiveStream(String receiveStream) {
+ this.receiveStream = receiveStream;
+ }
+
+ @Override
+ public String toString() {
+ return "SendRtpItem{" +
+ "ip='" + ip + '\'' +
+ ", port=" + port +
+ ", ssrc='" + ssrc + '\'' +
+ ", platformId='" + platformId + '\'' +
+ ", deviceId='" + deviceId + '\'' +
+ ", app='" + app + '\'' +
+ ", channelId='" + channelId + '\'' +
+ ", status=" + status +
+ ", stream='" + stream + '\'' +
+ ", tcp=" + tcp +
+ ", tcpActive=" + tcpActive +
+ ", localPort=" + localPort +
+ ", mediaServerId='" + mediaServerId + '\'' +
+ ", serverId='" + serverId + '\'' +
+ ", CallId='" + CallId + '\'' +
+ ", fromTag='" + fromTag + '\'' +
+ ", toTag='" + toTag + '\'' +
+ ", pt=" + pt +
+ ", usePs=" + usePs +
+ ", onlyAudio=" + onlyAudio +
+ ", rtcp=" + rtcp +
+ ", playType=" + playType +
+ ", receiveStream='" + receiveStream + '\'' +
+ '}';
+ }
}
--
Gitblit v1.8.0