From 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期三, 10 四月 2024 20:49:44 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into develop-add-api-key
---
src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java | 19 -------------------
1 files changed, 0 insertions(+), 19 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 2853cd2..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,7 +2,6 @@
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 io.swagger.v3.oas.annotations.media.Schema;
@@ -174,24 +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());
- 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