From ce950dea4aef933a12e78e4fe1f535ba9a83c3df Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期三, 10 四月 2024 22:18:40 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into develop-add-api-key
---
src/main/java/com/genersoft/iot/vmp/media/event/media/MediaArrivalEvent.java | 10 ----------
1 files changed, 0 insertions(+), 10 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 cebcccd..2379321 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,6 +1,5 @@
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.bean.MediaServer;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
@@ -20,15 +19,6 @@
mediaArrivalEvent.setStream(hookParam.getStream());
mediaArrivalEvent.setMediaServer(mediaServer);
mediaArrivalEvent.setSchema(hookParam.getSchema());
- 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;
}
--
Gitblit v1.8.0