From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SsrcTransaction.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SsrcTransaction.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SsrcTransaction.java
index 47d4d8a..87d2635 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SsrcTransaction.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SsrcTransaction.java
@@ -1,16 +1,18 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import javax.sip.message.Request;
+import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
public class SsrcTransaction {
private String deviceId;
private String channelId;
- private String ssrc;
- private String streamId;
+ private String callId;
+ private String stream;
private byte[] transaction;
private byte[] dialog;
private String mediaServerId;
+ private String ssrc;
+ private VideoStreamSessionManager.SessionType type;
public String getDeviceId() {
return deviceId;
@@ -28,20 +30,20 @@
this.channelId = channelId;
}
- public String getSsrc() {
- return ssrc;
+ public String getCallId() {
+ return callId;
}
- public void setSsrc(String ssrc) {
- this.ssrc = ssrc;
+ public void setCallId(String callId) {
+ this.callId = callId;
}
- 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 byte[] getTransaction() {
@@ -67,4 +69,20 @@
public void setMediaServerId(String mediaServerId) {
this.mediaServerId = mediaServerId;
}
+
+ public String getSsrc() {
+ return ssrc;
+ }
+
+ public void setSsrc(String ssrc) {
+ this.ssrc = ssrc;
+ }
+
+ public VideoStreamSessionManager.SessionType getType() {
+ return type;
+ }
+
+ public void setType(VideoStreamSessionManager.SessionType type) {
+ this.type = type;
+ }
}
--
Gitblit v1.8.0