From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java | 48 ++++++++++--------------------------------------
1 files changed, 10 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..2dd92eb 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;
@@ -47,6 +45,8 @@
private Long aliveSecond;
@Schema(description = "鏁版嵁浜х敓閫熷害锛屽崟浣峛yte/s")
private Long bytesSpeed;
+ @Schema(description = "閴存潈鍙傛暟")
+ private String callId;
public static MediaInfo getInstance(JSONObject jsonObject, MediaServer mediaServer) {
MediaInfo mediaInfo = new MediaInfo();
@@ -178,42 +178,6 @@
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;
- }
-
public Integer getReaderCount() {
return readerCount;
}
@@ -341,4 +305,12 @@
public void setSchema(String schema) {
this.schema = schema;
}
+
+ public String getCallId() {
+ return callId;
+ }
+
+ public void setCallId(String callId) {
+ this.callId = callId;
+ }
}
--
Gitblit v1.8.0