From 64b6a3560399cfe742d998209c3ff315c4856b9e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 04 一月 2024 11:33:29 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/common/InviteInfo.java | 21 +--------------------
1 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/common/InviteInfo.java b/src/main/java/com/genersoft/iot/vmp/common/InviteInfo.java
index 029b7ca..dabdb4f 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/InviteInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/InviteInfo.java
@@ -29,7 +29,7 @@
private StreamInfo streamInfo;
- public static InviteInfo getinviteInfo(String deviceId, String channelId, String stream, SSRCInfo ssrcInfo,
+ public static InviteInfo getInviteInfo(String deviceId, String channelId, String stream, SSRCInfo ssrcInfo,
String receiveIp, Integer receivePort, String streamMode,
InviteSessionType type, InviteSessionStatus status) {
InviteInfo inviteInfo = new InviteInfo();
@@ -138,25 +138,6 @@
this.subStream = subStream;
}
- public static InviteInfo getInviteInfo(String deviceId, String channelId,Boolean isSubStream, String stream, SSRCInfo ssrcInfo,
- String receiveIp, Integer receivePort, String streamMode,
- InviteSessionType type, InviteSessionStatus status) {
- InviteInfo inviteInfo = new InviteInfo();
- inviteInfo.setDeviceId(deviceId);
- inviteInfo.setChannelId(channelId);
- inviteInfo.setStream(stream);
- inviteInfo.setSsrcInfo(ssrcInfo);
- inviteInfo.setReceiveIp(receiveIp);
- inviteInfo.setReceivePort(receivePort);
- inviteInfo.setStreamMode(streamMode);
- inviteInfo.setType(type);
- inviteInfo.setStatus(status);
- if(isSubStream != null){
- inviteInfo.setSubStream(isSubStream);
- }
- return inviteInfo;
- }
- /*=========================璁惧涓诲瓙鐮佹祦閫昏緫END====================*/
--
Gitblit v1.8.0