From b4048fbe80dba8e7756ae557a15ab60b4f80a44b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 04 四月 2023 09:09:07 +0800
Subject: [PATCH] 合并开源主线

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java |  176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 167 insertions(+), 9 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 f3ec337..361bdc6 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
@@ -22,7 +22,17 @@
      */
     private String platformId;
 
+     /**
+     * 瀵瑰簲璁惧id
+     */
+    private String deviceId;
+
     /**
+     * 鐩存挱娴佺殑搴旂敤鍚�
+     */
+    private String app;
+
+   /**
      * 閫氶亾id
      */
     private String channelId;
@@ -35,15 +45,11 @@
      */
     private int status = 0;
 
-    /**
-     * 璁惧鎺ㄦ祦鐨刟pp
-     */
-    private String app = "rtp";
 
     /**
      * 璁惧鎺ㄦ祦鐨剆treamId
      */
-    private String streamId;
+    private String stream;
 
     /**
      * 鏄惁涓簍cp
@@ -59,6 +65,62 @@
      * 鑷繁鎺ㄦ祦浣跨敤鐨勭鍙�
      */
     private int localPort;
+
+    /**
+     * 浣跨敤鐨勬祦濯掍綋
+     */
+    private String mediaServerId;
+
+    /**
+     * 浣跨敤鐨勬湇鍔＄殑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 String receiveStream;
 
     public String getIp() {
         return ip;
@@ -92,6 +154,14 @@
         this.platformId = platformId;
     }
 
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public String getChannelId() {
         return channelId;
     }
@@ -116,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() {
@@ -147,4 +217,92 @@
     public void setTcpActive(boolean tcpActive) {
         this.tcpActive = tcpActive;
     }
+
+    public String getMediaServerId() {
+        return mediaServerId;
+    }
+
+    public void setMediaServerId(String mediaServerId) {
+        this.mediaServerId = mediaServerId;
+    }
+
+    public String getCallId() {
+        return CallId;
+    }
+
+    public void setCallId(String callId) {
+        CallId = callId;
+    }
+
+    public InviteStreamType getPlayType() {
+        return playType;
+    }
+
+    public void setPlayType(InviteStreamType playType) {
+        this.playType = playType;
+    }
+
+    public int getPt() {
+        return pt;
+    }
+
+    public void setPt(int pt) {
+        this.pt = pt;
+    }
+
+    public boolean isUsePs() {
+        return usePs;
+    }
+
+    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;
+    }
 }

--
Gitblit v1.8.0