From 2fe9e519b42408c07630735ab76e86b999f72948 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 26 十月 2020 17:02:29 +0800
Subject: [PATCH] Merge branch 'master' into master
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
index 0e7da44..1dd3a85 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -1,5 +1,7 @@
package com.genersoft.iot.vmp.common;
+import com.alibaba.fastjson.JSONArray;
+
public class StreamInfo {
private String ssrc;
@@ -10,6 +12,7 @@
private String rtmp;
private String hls;
private String rtsp;
+ private JSONArray tracks;
public String getSsrc() {
return ssrc;
@@ -17,6 +20,22 @@
public void setSsrc(String ssrc) {
this.ssrc = ssrc;
+ }
+
+ public String getDeviceID() {
+ return deviceID;
+ }
+
+ public void setDeviceID(String deviceID) {
+ this.deviceID = deviceID;
+ }
+
+ public String getCahnnelId() {
+ return cahnnelId;
+ }
+
+ public void setCahnnelId(String cahnnelId) {
+ this.cahnnelId = cahnnelId;
}
public String getFlv() {
@@ -59,19 +78,11 @@
this.rtsp = rtsp;
}
- public String getDeviceID() {
- return deviceID;
+ public JSONArray getTracks() {
+ return tracks;
}
- public void setDeviceID(String deviceID) {
- this.deviceID = deviceID;
- }
-
- public String getCahnnelId() {
- return cahnnelId;
- }
-
- public void setCahnnelId(String cahnnelId) {
- this.cahnnelId = cahnnelId;
+ public void setTracks(JSONArray tracks) {
+ this.tracks = tracks;
}
}
--
Gitblit v1.8.0