From b1b6fae22c5ab3013d73df1a43cd42f7fe0fa347 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 四月 2024 10:35:11 +0800
Subject: [PATCH] Merge branch 'master' into dev/zlm
---
src/main/java/com/genersoft/iot/vmp/media/event/media/MediaArrivalEvent.java | 12 +++++++++++-
1 files changed, 11 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 af1e23e..cebcccd 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
@@ -1,7 +1,8 @@
package com.genersoft.iot.vmp.media.event.media;
+import com.genersoft.iot.vmp.media.abl.bean.hook.OnStreamArriveABLHookParam;
import com.genersoft.iot.vmp.media.bean.MediaInfo;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
/**
@@ -22,6 +23,15 @@
mediaArrivalEvent.setCallId(hookParam.getCallId());
return mediaArrivalEvent;
}
+ public static MediaArrivalEvent getInstance(Object source, OnStreamArriveABLHookParam hookParam, MediaServer mediaServer){
+ MediaArrivalEvent mediaArrivalEvent = new MediaArrivalEvent(source);
+ mediaArrivalEvent.setMediaInfo(MediaInfo.getInstance(hookParam, mediaServer));
+ mediaArrivalEvent.setApp(hookParam.getApp());
+ mediaArrivalEvent.setStream(hookParam.getStream());
+ mediaArrivalEvent.setMediaServer(mediaServer);
+ mediaArrivalEvent.setCallId(hookParam.getCallId());
+ return mediaArrivalEvent;
+ }
private MediaInfo mediaInfo;
--
Gitblit v1.8.0