Преглед на файлове

add 媒体设备刷新通道

18339543638 преди 3 години
родител
ревизия
d8ffdebbdd

+ 0 - 54
jetlinks-manager/media-manager/src/main/java/org/jetlinks/community/media/zlm/dto/MediaItem.java

@@ -98,60 +98,6 @@ public class MediaItem implements Serializable {
      */
     private boolean docker;
 
-    public static class MediaTrack implements Serializable{
-        private static final Long serialVersionUID=1L;
-        /**
-         * 音频通道数
-         */
-        private int channels;
-
-        /**
-         *  H264 = 0, H265 = 1, AAC = 2, G711A = 3, G711U = 4
-         */
-        private int codecId;
-
-        /**
-         * 编码类型名称 CodecAAC CodecH264
-         */
-        private String codecIdName;
-
-        /**
-         * Video = 0, Audio = 1
-         */
-        private int codecType;
-
-        /**
-         * 轨道是否准备就绪
-         */
-        private boolean ready;
-
-        /**
-         * 音频采样位数
-         */
-        private int sampleBit;
-
-        /**
-         * 音频采样率
-         */
-        private int sampleRate;
-
-        /**
-         * 视频fps
-         */
-        private int fps;
-
-        /**
-         * 视频高
-         */
-        private int height;
-
-        /**
-         * 视频宽
-         */
-        private int width;
-
-    }
-
     @Override
     public String toString() {
         return "MediaItem{" +

+ 57 - 0
jetlinks-manager/media-manager/src/main/java/org/jetlinks/community/media/zlm/dto/MediaTrack.java

@@ -0,0 +1,57 @@
+package org.jetlinks.community.media.zlm.dto;
+
+import java.io.Serializable;
+
+public class MediaTrack implements Serializable {
+    private static final Long serialVersionUID=1L;
+    /**
+     * 音频通道数
+     */
+    private int channels;
+
+    /**
+     *  H264 = 0, H265 = 1, AAC = 2, G711A = 3, G711U = 4
+     */
+    private int codecId;
+
+    /**
+     * 编码类型名称 CodecAAC CodecH264
+     */
+    private String codecIdName;
+
+    /**
+     * Video = 0, Audio = 1
+     */
+    private int codecType;
+
+    /**
+     * 轨道是否准备就绪
+     */
+    private boolean ready;
+
+    /**
+     * 音频采样位数
+     */
+    private int sampleBit;
+
+    /**
+     * 音频采样率
+     */
+    private int sampleRate;
+
+    /**
+     * 视频fps
+     */
+    private int fps;
+
+    /**
+     * 视频高
+     */
+    private int height;
+
+    /**
+     * 视频宽
+     */
+    private int width;
+
+}

+ 1 - 1
jetlinks-manager/media-manager/src/main/java/org/jetlinks/community/media/zlm/dto/StreamPushItem.java

@@ -70,7 +70,7 @@ public class StreamPushItem extends GbStream implements Comparable<StreamPushIte
     /**
      * 音视频轨道
      */
-    private List<MediaItem.MediaTrack> tracks;
+    private List<MediaTrack> tracks;
 
     /**
      * 音视频轨道