From 039fbf7e243d4bf0f46b44e7dae2a5d36e978056 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 14:32:53 +0800
Subject: [PATCH] Merge branch 'talk' into main-dev

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 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 c1fe2c1..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
@@ -49,7 +49,7 @@
     /**
      * 璁惧鎺ㄦ祦鐨剆treamId
      */
-    private String streamId;
+    private String stream;
 
     /**
      * 鏄惁涓簍cp
@@ -117,6 +117,11 @@
      */
     private InviteStreamType playType;
 
+    /**
+     * 鍙戞祦鐨勫悓鏃舵敹娴�
+     */
+    private String receiveStream;
+
     public String getIp() {
         return ip;
     }
@@ -181,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() {
@@ -292,4 +297,12 @@
     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