From 6968839f21fb05bf6e3204c2040ee47130006cd0 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 27 十二月 2020 08:19:34 +0800
Subject: [PATCH] 修复空指针异常
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 22 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..0fb76b9 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -4,22 +4,35 @@
public class StreamInfo {
- private String ssrc;
+ private String streamId;
private String deviceID;
private String cahnnelId;
private String flv;
private String ws_flv;
- private String rtmp;
+ private String fmp4;
+ private String ws_fmp4;
private String hls;
+ private String ws_hls;
+ private String ts;
+ private String ws_ts;
+ private String rtmp;
private String rtsp;
private JSONArray tracks;
- public String getSsrc() {
- return ssrc;
+ public String getDeviceID() {
+ return deviceID;
}
- public void setSsrc(String ssrc) {
- this.ssrc = ssrc;
+ public void setDeviceID(String deviceID) {
+ this.deviceID = deviceID;
+ }
+
+ public String getCahnnelId() {
+ return cahnnelId;
+ }
+
+ public void setCahnnelId(String cahnnelId) {
+ this.cahnnelId = cahnnelId;
}
public String getFlv() {
@@ -62,22 +75,6 @@
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() {
return tracks;
}
@@ -85,4 +82,52 @@
public void setTracks(JSONArray tracks) {
this.tracks = tracks;
}
+
+ public String getFmp4() {
+ return fmp4;
+ }
+
+ public void setFmp4(String fmp4) {
+ this.fmp4 = fmp4;
+ }
+
+ public String getWs_fmp4() {
+ return ws_fmp4;
+ }
+
+ public void setWs_fmp4(String ws_fmp4) {
+ this.ws_fmp4 = ws_fmp4;
+ }
+
+ public String getWs_hls() {
+ return ws_hls;
+ }
+
+ public void setWs_hls(String ws_hls) {
+ this.ws_hls = ws_hls;
+ }
+
+ public String getTs() {
+ return ts;
+ }
+
+ public void setTs(String ts) {
+ this.ts = ts;
+ }
+
+ public String getWs_ts() {
+ return ws_ts;
+ }
+
+ public void setWs_ts(String ws_ts) {
+ this.ws_ts = ws_ts;
+ }
+
+ public String getStreamId() {
+ return streamId;
+ }
+
+ public void setStreamId(String streamId) {
+ this.streamId = streamId;
+ }
}
--
Gitblit v1.8.0