From 54b878d2e1e089cdeb7a957b78aa1f4cbdd6da6c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 四月 2024 22:43:45 +0800
Subject: [PATCH] 优化代码，升级版本号为2.7.1
---
src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 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 2cc9943..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
@@ -12,6 +12,15 @@
*/
@Schema(description = "瑙嗛淇℃伅")
public class MediaInfo {
+ @Schema(description = "搴旂敤鍚�")
+ private String app;
+ @Schema(description = "娴両D")
+ private String stream;
+ @Schema(description = "娴佸獟浣撹妭鐐�")
+ private MediaServer mediaServer;
+ @Schema(description = "鍗忚")
+ private String schema;
+
@Schema(description = "瑙傜湅浜烘暟")
private Integer readerCount;
@Schema(description = "瑙嗛缂栫爜绫诲瀷")
@@ -37,8 +46,15 @@
@Schema(description = "鏁版嵁浜х敓閫熷害锛屽崟浣峛yte/s")
private Long bytesSpeed;
- public static MediaInfo getInstance(JSONObject jsonObject) {
+ public static MediaInfo getInstance(JSONObject jsonObject, MediaServer mediaServer) {
MediaInfo mediaInfo = new MediaInfo();
+ mediaInfo.setMediaServer(mediaServer);
+ String app = jsonObject.getString("app");
+ mediaInfo.setApp(app);
+ String stream = jsonObject.getString("stream");
+ mediaInfo.setStream(stream);
+ String schema = jsonObject.getString("schema");
+ mediaInfo.setSchema(schema);
Integer totalReaderCount = jsonObject.getInteger("totalReaderCount");
Boolean online = jsonObject.getBoolean("online");
Integer originType = jsonObject.getInteger("originType");
@@ -110,14 +126,22 @@
return mediaInfo;
}
- public static MediaInfo getInstance(OnStreamChangedHookParam param) {
- List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
+ public static MediaInfo getInstance(OnStreamChangedHookParam param, MediaServer mediaServer) {
+
MediaInfo mediaInfo = new MediaInfo();
+ mediaInfo.setApp(param.getApp());
+ mediaInfo.setStream(param.getStream());
+ mediaInfo.setSchema(param.getSchema());
+ mediaInfo.setMediaServer(mediaServer);
mediaInfo.setReaderCount(param.getTotalReaderCount());
mediaInfo.setOnline(param.isRegist());
mediaInfo.setOriginType(param.getOriginType());
mediaInfo.setAliveSecond(param.getAliveSecond());
mediaInfo.setBytesSpeed(param.getBytesSpeed());
+ List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
+ if (tracks == null || tracks.isEmpty()) {
+ return mediaInfo;
+ }
for (OnStreamChangedHookParam.MediaTrack mediaTrack : tracks) {
switch (mediaTrack.getCodec_id()) {
case 0:
@@ -247,4 +271,36 @@
public void setBytesSpeed(Long bytesSpeed) {
this.bytesSpeed = bytesSpeed;
}
+
+ public String getApp() {
+ return app;
+ }
+
+ public void setApp(String app) {
+ this.app = app;
+ }
+
+ public String getStream() {
+ return stream;
+ }
+
+ public void setStream(String stream) {
+ this.stream = stream;
+ }
+
+ public MediaServer getMediaServer() {
+ return mediaServer;
+ }
+
+ public void setMediaServer(MediaServer mediaServer) {
+ this.mediaServer = mediaServer;
+ }
+
+ public String getSchema() {
+ return schema;
+ }
+
+ public void setSchema(String schema) {
+ this.schema = schema;
+ }
}
--
Gitblit v1.8.0