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/media/zlm/dto/MediaItem.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java
index 51a89b2..ad158ec 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java
@@ -1,10 +1,15 @@
package com.genersoft.iot.vmp.media.zlm.dto;
-import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.common.StreamInfo;
import java.util.List;
public class MediaItem {
+
+ /**
+ * 娉ㄥ唽/娉ㄩ攢
+ */
+ private boolean regist;
/**
* 搴旂敤鍚�
@@ -56,6 +61,11 @@
private String originUrl;
/**
+ * 鏈嶅姟鍣╥d
+ */
+ private String mediaServerId;
+
+ /**
* GMT unix绯荤粺鏃堕棿鎴筹紝鍗曚綅绉�
*/
private Long createStamp;
@@ -80,6 +90,18 @@
*/
private String vhost;
+ public boolean isRegist() {
+ return regist;
+ }
+
+ public void setRegist(boolean regist) {
+ this.regist = regist;
+ }
+
+ /**
+ * 鏄惁鏄痙ocker閮ㄧ讲锛� docker閮ㄧ讲涓嶄細鑷姩鏇存柊zlm浣跨敤鐨勭鍙ｏ紝闇�瑕佽嚜宸辨墜鍔ㄤ慨鏀�
+ */
+ private boolean docker;
public static class MediaTrack {
/**
@@ -261,6 +283,8 @@
}
}
+ private StreamInfo streamInfo;
+
public String getApp() {
return app;
}
@@ -366,4 +390,28 @@
public OriginSock getOriginSock() {
return originSock;
}
+
+ public boolean isDocker() {
+ return docker;
+ }
+
+ public void setDocker(boolean docker) {
+ this.docker = docker;
+ }
+
+ public String getMediaServerId() {
+ return mediaServerId;
+ }
+
+ public void setMediaServerId(String mediaServerId) {
+ this.mediaServerId = mediaServerId;
+ }
+
+ public StreamInfo getStreamInfo() {
+ return streamInfo;
+ }
+
+ public void setStreamInfo(StreamInfo streamInfo) {
+ this.streamInfo = streamInfo;
+ }
}
--
Gitblit v1.8.0