From ef19b4f85ff6442fbf87ae5c447575b0852fe463 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 26 十月 2020 09:52:23 +0800
Subject: [PATCH] Merge pull request #2 from lawrencehj/master
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 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 270f72a..1dd3a85 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -22,6 +22,22 @@
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() {
return flv;
}
@@ -60,22 +76,6 @@
public void setRtsp(String rtsp) {
this.rtsp = rtsp;
- }
-
- 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 JSONArray getTracks() {
--
Gitblit v1.8.0