From 668dc8f0dd8b667a95838eb5d0083a101aa2b6b0 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 七月 2023 14:47:24 +0800
Subject: [PATCH] Merge branch '2.6.8' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/bean/OtherRtpSendInfo.java | 89 ++++++++++++++++++++++++++++++--------------
1 files changed, 60 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/OtherRtpSendInfo.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/OtherRtpSendInfo.java
index 225e40c..75c05d3 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/OtherRtpSendInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/OtherRtpSendInfo.java
@@ -5,12 +5,17 @@
/**
* 鍙戞祦IP
*/
- private String ip;
+ private String sendLocalIp;
/**
- * 鍙戞祦绔彛
+ * 闊抽鍙戞祦绔彛
*/
- private int port;
+ private int sendLocalPortForAudio;
+
+ /**
+ * 瑙嗛鍙戞祦绔彛
+ */
+ private int sendLocalPortForVideo;
/**
* 鏀舵祦IP
@@ -18,9 +23,14 @@
private String receiveIp;
/**
- * 鏀舵祦绔彛
+ * 闊抽鏀舵祦绔彛
*/
- private int receivePort;
+ private int receivePortForAudio;
+
+ /**
+ * 瑙嗛鏀舵祦绔彛
+ */
+ private int receivePortForVideo;
/**
* 浼氳瘽ID
@@ -48,23 +58,6 @@
private String pushSSRC;
-
- public String getIp() {
- return ip;
- }
-
- public void setIp(String ip) {
- this.ip = ip;
- }
-
- public int getPort() {
- return port;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
public String getReceiveIp() {
return receiveIp;
}
@@ -73,12 +66,20 @@
this.receiveIp = receiveIp;
}
- public int getReceivePort() {
- return receivePort;
+ public int getReceivePortForAudio() {
+ return receivePortForAudio;
}
- public void setReceivePort(int receivePort) {
- this.receivePort = receivePort;
+ public void setReceivePortForAudio(int receivePortForAudio) {
+ this.receivePortForAudio = receivePortForAudio;
+ }
+
+ public int getReceivePortForVideo() {
+ return receivePortForVideo;
+ }
+
+ public void setReceivePortForVideo(int receivePortForVideo) {
+ this.receivePortForVideo = receivePortForVideo;
}
public String getCallId() {
@@ -121,15 +122,45 @@
this.pushSSRC = pushSSRC;
}
+
+ public String getSendLocalIp() {
+ return sendLocalIp;
+ }
+
+ public void setSendLocalIp(String sendLocalIp) {
+ this.sendLocalIp = sendLocalIp;
+ }
+
+ public int getSendLocalPortForAudio() {
+ return sendLocalPortForAudio;
+ }
+
+ public void setSendLocalPortForAudio(int sendLocalPortForAudio) {
+ this.sendLocalPortForAudio = sendLocalPortForAudio;
+ }
+
+ public int getSendLocalPortForVideo() {
+ return sendLocalPortForVideo;
+ }
+
+ public void setSendLocalPortForVideo(int sendLocalPortForVideo) {
+ this.sendLocalPortForVideo = sendLocalPortForVideo;
+ }
+
@Override
public String toString() {
return "OtherRtpSendInfo{" +
- "ip='" + ip + '\'' +
- ", port=" + port +
+ "sendLocalIp='" + sendLocalIp + '\'' +
+ ", sendLocalPortForAudio=" + sendLocalPortForAudio +
+ ", sendLocalPortForVideo=" + sendLocalPortForVideo +
", receiveIp='" + receiveIp + '\'' +
- ", receivePort=" + receivePort +
+ ", receivePortForAudio=" + receivePortForAudio +
+ ", receivePortForVideo=" + receivePortForVideo +
", callId='" + callId + '\'' +
", stream='" + stream + '\'' +
+ ", pushApp='" + pushApp + '\'' +
+ ", pushStream='" + pushStream + '\'' +
+ ", pushSSRC='" + pushSSRC + '\'' +
'}';
}
}
--
Gitblit v1.8.0