From bbf19c79091c46ac5465909429caef6e79c02e55 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 四月 2024 10:40:16 +0800
Subject: [PATCH] 合并主线

---
 src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java |   38 --------------------------------------
 1 files changed, 0 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java b/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
index 8ee0eaf..f1c3d58 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
@@ -2,9 +2,7 @@
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.media.abl.bean.hook.OnStreamArriveABLHookParam;
 import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
-import com.genersoft.iot.vmp.media.zlm.dto.hook.OriginType;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.util.List;
@@ -175,42 +173,6 @@
                 mediaInfo.setWidth(mediaTrack.getWidth());
             }
         }
-        return mediaInfo;
-    }
-
-    public static MediaInfo getInstance(OnStreamArriveABLHookParam param, MediaServer mediaServer) {
-
-        MediaInfo mediaInfo = new MediaInfo();
-        mediaInfo.setApp(param.getApp());
-        mediaInfo.setStream(param.getStream());
-        mediaInfo.setMediaServer(mediaServer);
-        mediaInfo.setReaderCount(param.getReaderCount());
-        mediaInfo.setOnline(true);
-        mediaInfo.setVideoCodec(param.getVideoCodec());
-        switch (param.getNetworkType()) {
-            case 21:
-                mediaInfo.setOriginType(OriginType.RTMP_PUSH.ordinal());
-                break;
-            case 23:
-                mediaInfo.setOriginType(OriginType.RTSP_PUSH.ordinal());
-                break;
-            case 30:
-            case 31:
-            case 32:
-            case 33:
-                mediaInfo.setOriginType(OriginType.PULL.ordinal());
-                break;
-            default:
-                mediaInfo.setOriginType(OriginType.UNKNOWN.ordinal());
-                break;
-
-        }
-        mediaInfo.setWidth(param.getWidth());
-        mediaInfo.setHeight(param.getHeight());
-        mediaInfo.setAudioCodec(param.getAudioCodec());
-        mediaInfo.setAudioChannels(param.getAudioChannels());
-        mediaInfo.setAudioSampleRate(param.getAudioSampleRate());
-
         return mediaInfo;
     }
 

--
Gitblit v1.8.0