From 8874c90db2c238fa4c55df491675fe7fec9d93b2 Mon Sep 17 00:00:00 2001
From: fine <54142345+criver31@users.noreply.github.com>
Date: 星期二, 09 一月 2024 11:45:30 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamAuthorityInfo.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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
old mode 100644
new mode 100755
index 36a0363..ef77225
--- 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,5 +1,8 @@
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;
+
/**
* 娴佺殑閴存潈淇℃伅
* @author lin
@@ -102,13 +105,13 @@
return streamAuthorityInfo;
}
- public static StreamAuthorityInfo getInstanceByHook(MediaItem mediaItem) {
+ public static StreamAuthorityInfo getInstanceByHook(OnStreamChangedHookParam onStreamChangedHookParam) {
StreamAuthorityInfo streamAuthorityInfo = new StreamAuthorityInfo();
- streamAuthorityInfo.setApp(mediaItem.getApp());
- streamAuthorityInfo.setStream(mediaItem.getStream());
- streamAuthorityInfo.setId(mediaItem.getMediaServerId());
- streamAuthorityInfo.setOriginType(mediaItem.getOriginType());
- streamAuthorityInfo.setOriginTypeStr(mediaItem.getOriginTypeStr());
+ streamAuthorityInfo.setApp(onStreamChangedHookParam.getApp());
+ streamAuthorityInfo.setStream(onStreamChangedHookParam.getStream());
+ streamAuthorityInfo.setId(onStreamChangedHookParam.getMediaServerId());
+ streamAuthorityInfo.setOriginType(onStreamChangedHookParam.getOriginType());
+ streamAuthorityInfo.setOriginTypeStr(onStreamChangedHookParam.getOriginTypeStr());
return streamAuthorityInfo;
}
}
--
Gitblit v1.8.0