From 87c071fd5e774091c7d87f3d7c24fd2360148d58 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 25 六月 2024 10:24:35 +0800
Subject: [PATCH] 合并271分支
---
src/main/java/com/genersoft/iot/vmp/media/event/media/MediaArrivalEvent.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaArrivalEvent.java b/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaArrivalEvent.java
index 2379321..2f51a3e 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaArrivalEvent.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaArrivalEvent.java
@@ -3,6 +3,7 @@
import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
+import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
/**
* 娴佸埌鏉ヤ簨浠�
@@ -19,13 +20,18 @@
mediaArrivalEvent.setStream(hookParam.getStream());
mediaArrivalEvent.setMediaServer(mediaServer);
mediaArrivalEvent.setSchema(hookParam.getSchema());
- mediaArrivalEvent.setCallId(hookParam.getCallId());
+ mediaArrivalEvent.setSchema(hookParam.getSchema());
+ mediaArrivalEvent.setHookParam(hookParam);
return mediaArrivalEvent;
}
private MediaInfo mediaInfo;
private String callId;
+
+ private OnStreamChangedHookParam hookParam;
+
+ private StreamContent streamInfo;
public MediaInfo getMediaInfo() {
return mediaInfo;
@@ -43,4 +49,20 @@
public void setCallId(String callId) {
this.callId = callId;
}
+
+ public OnStreamChangedHookParam getHookParam() {
+ return hookParam;
+ }
+
+ public void setHookParam(OnStreamChangedHookParam hookParam) {
+ this.hookParam = hookParam;
+ }
+
+ public StreamContent getStreamInfo() {
+ return streamInfo;
+ }
+
+ public void setStreamInfo(StreamContent streamInfo) {
+ this.streamInfo = streamInfo;
+ }
}
--
Gitblit v1.8.0