From 407a5b77c3586fef44dc771e48f05c2354740795 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期二, 07 九月 2021 09:20:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java |  168 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 143 insertions(+), 25 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 6e876be..771838d 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -1,20 +1,58 @@
 package com.genersoft.iot.vmp.common;
 
+import com.alibaba.fastjson.JSONArray;
+
 public class StreamInfo {
 
-    private String ssrc;
+    private String app;
+    private String streamId;
+    private String deviceID;
+    private String channelId;
     private String flv;
-    private String WS_FLV;
-    private String RTMP;
-    private String HLS;
-    private String RTSP;
+    private String ws_flv;
+    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 String rtc;
+    private String mediaServerId;
+    private JSONArray tracks;
 
-    public String getSsrc() {
-        return ssrc;
+    public static class TransactionInfo{
+        public String callId;
+        public String localTag;
+        public String remoteTag;
+        public String branch;
     }
 
-    public void setSsrc(String ssrc) {
-        this.ssrc = ssrc;
+    private TransactionInfo transactionInfo;
+
+    public String getApp() {
+        return app;
+    }
+
+    public void setApp(String app) {
+        this.app = app;
+    }
+
+    public String getDeviceID() {
+        return deviceID;
+    }
+
+    public void setDeviceID(String deviceID) {
+        this.deviceID = deviceID;
+    }
+
+    public String getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(String channelId) {
+        this.channelId = channelId;
     }
 
     public String getFlv() {
@@ -25,35 +63,115 @@
         this.flv = flv;
     }
 
-    public String getWS_FLV() {
-        return WS_FLV;
+    public String getWs_flv() {
+        return ws_flv;
     }
 
-    public void setWS_FLV(String WS_FLV) {
-        this.WS_FLV = WS_FLV;
+    public void setWs_flv(String ws_flv) {
+        this.ws_flv = ws_flv;
     }
 
-    public String getRTMP() {
-        return RTMP;
+    public String getRtmp() {
+        return rtmp;
     }
 
-    public void setRTMP(String RTMP) {
-        this.RTMP = RTMP;
+    public void setRtmp(String rtmp) {
+        this.rtmp = rtmp;
     }
 
-    public String getHLS() {
-        return HLS;
+    public String getHls() {
+        return hls;
     }
 
-    public void setHLS(String HLS) {
-        this.HLS = HLS;
+    public void setHls(String hls) {
+        this.hls = hls;
     }
 
-    public String getRTSP() {
-        return RTSP;
+    public String getRtsp() {
+        return rtsp;
     }
 
-    public void setRTSP(String RTSP) {
-        this.RTSP = RTSP;
+    public void setRtsp(String rtsp) {
+        this.rtsp = rtsp;
+    }
+
+    public JSONArray getTracks() {
+        return tracks;
+    }
+
+    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;
+    }
+
+    public String getRtc() {
+        return rtc;
+    }
+
+    public void setRtc(String rtc) {
+        this.rtc = rtc;
+    }
+
+    public TransactionInfo getTransactionInfo() {
+        return transactionInfo;
+    }
+
+    public void setTransactionInfo(TransactionInfo transactionInfo) {
+        this.transactionInfo = transactionInfo;
+    }
+
+    public String getMediaServerId() {
+        return mediaServerId;
+    }
+
+    public void setMediaServerId(String mediaServerId) {
+        this.mediaServerId = mediaServerId;
     }
 }

--
Gitblit v1.8.0