From ecf84bb0f1952c4a044ff6c8aa18226b31593f3f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 18 十一月 2022 21:52:02 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 23 ++---------------------
1 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
index bb0fa3d..b518709 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
@@ -5,9 +5,9 @@
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
+import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeFactory;
+import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForRtpServerTimeout;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.media.zlm.dto.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -346,23 +346,4 @@
return result;
}
- public void closeAllSendRtpStream() {
-
- }
-
- public MediaItem getMediaInfo(MediaServerItem mediaServerItem, String app, String stream) {
- JSONObject json = zlmresTfulUtils.getMediaList(mediaServerItem, app, stream);
- MediaItem mediaItem = null;
- if (json == null || json.getInteger("code") != 0) {
- return null;
- } else {
- JSONArray data = json.getJSONArray("data");
- if (data == null || data.size() == 0) {
- return null;
- }else {
- mediaItem = JSONObject.toJavaObject(data.getJSONObject(0), MediaItem.class);
- }
- }
- return mediaItem;
- }
}
--
Gitblit v1.8.0