From bbf19c79091c46ac5465909429caef6e79c02e55 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 四月 2024 10:40:16 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/media/event/media/MediaRecordMp4Event.java | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaRecordMp4Event.java b/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaRecordMp4Event.java
index 9fd6def..093c3c2 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaRecordMp4Event.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/event/media/MediaRecordMp4Event.java
@@ -1,7 +1,5 @@
package com.genersoft.iot.vmp.media.event.media;
-import com.genersoft.iot.vmp.media.abl.ABLHttpHookListener;
-import com.genersoft.iot.vmp.media.abl.bean.hook.OnRecordMp4ABLHookParam;
import com.genersoft.iot.vmp.media.bean.RecordInfo;
import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnRecordMp4HookParam;
@@ -17,16 +15,6 @@
private RecordInfo recordInfo;
public static MediaRecordMp4Event getInstance(Object source, OnRecordMp4HookParam hookParam, MediaServer mediaServer){
- MediaRecordMp4Event mediaRecordMp4Event = new MediaRecordMp4Event(source);
- mediaRecordMp4Event.setApp(hookParam.getApp());
- mediaRecordMp4Event.setStream(hookParam.getStream());
- RecordInfo recordInfo = RecordInfo.getInstance(hookParam);
- mediaRecordMp4Event.setRecordInfo(recordInfo);
- mediaRecordMp4Event.setMediaServer(mediaServer);
- return mediaRecordMp4Event;
- }
-
- public static MediaRecordMp4Event getInstance(ABLHttpHookListener source, OnRecordMp4ABLHookParam hookParam, MediaServer mediaServer) {
MediaRecordMp4Event mediaRecordMp4Event = new MediaRecordMp4Event(source);
mediaRecordMp4Event.setApp(hookParam.getApp());
mediaRecordMp4Event.setStream(hookParam.getStream());
--
Gitblit v1.8.0