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/media/zlm/dto/MediaItem.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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..6d9ceee 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,7 +1,5 @@
package com.genersoft.iot.vmp.media.zlm.dto;
-import com.alibaba.fastjson.JSONObject;
-
import java.util.List;
public class MediaItem {
@@ -80,6 +78,10 @@
*/
private String vhost;
+ /**
+ * 鏄惁鏄痙ocker閮ㄧ讲锛� docker閮ㄧ讲涓嶄細鑷姩鏇存柊zlm浣跨敤鐨勭鍙ｏ紝闇�瑕佽嚜宸辨墜鍔ㄤ慨鏀�
+ */
+ private boolean docker;
public static class MediaTrack {
/**
@@ -366,4 +368,12 @@
public OriginSock getOriginSock() {
return originSock;
}
+
+ public boolean isDocker() {
+ return docker;
+ }
+
+ public void setDocker(boolean docker) {
+ this.docker = docker;
+ }
}
--
Gitblit v1.8.0