From 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期三, 10 四月 2024 20:49:44 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into develop-add-api-key
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamAuthorityInfo.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamAuthorityInfo.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamAuthorityInfo.java
index ef77225..8b722a9 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamAuthorityInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamAuthorityInfo.java
@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.media.zlm.dto;
-import com.genersoft.iot.vmp.media.zlm.dto.hook.OnPublishHookParam;
-import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
+import com.genersoft.iot.vmp.media.event.media.MediaArrivalEvent;
/**
* 娴佺殑閴存潈淇℃伅
@@ -97,21 +96,23 @@
this.sign = sign;
}
- public static StreamAuthorityInfo getInstanceByHook(OnPublishHookParam hookParam) {
+ public static StreamAuthorityInfo getInstanceByHook(String app, String stream, String id) {
StreamAuthorityInfo streamAuthorityInfo = new StreamAuthorityInfo();
- streamAuthorityInfo.setApp(hookParam.getApp());
- streamAuthorityInfo.setStream(hookParam.getStream());
- streamAuthorityInfo.setId(hookParam.getId());
+ streamAuthorityInfo.setApp(app);
+ streamAuthorityInfo.setStream(stream);
+ streamAuthorityInfo.setId(id);
return streamAuthorityInfo;
}
- public static StreamAuthorityInfo getInstanceByHook(OnStreamChangedHookParam onStreamChangedHookParam) {
+ public static StreamAuthorityInfo getInstanceByHook(MediaArrivalEvent event) {
StreamAuthorityInfo streamAuthorityInfo = new StreamAuthorityInfo();
- streamAuthorityInfo.setApp(onStreamChangedHookParam.getApp());
- streamAuthorityInfo.setStream(onStreamChangedHookParam.getStream());
- streamAuthorityInfo.setId(onStreamChangedHookParam.getMediaServerId());
- streamAuthorityInfo.setOriginType(onStreamChangedHookParam.getOriginType());
- streamAuthorityInfo.setOriginTypeStr(onStreamChangedHookParam.getOriginTypeStr());
+ streamAuthorityInfo.setApp(event.getApp());
+ streamAuthorityInfo.setStream(event.getStream());
+ streamAuthorityInfo.setId(event.getMediaServer().getId());
+ if (event.getMediaInfo() != null) {
+ streamAuthorityInfo.setOriginType(event.getMediaInfo().getOriginType());
+ }
+
return streamAuthorityInfo;
}
}
--
Gitblit v1.8.0