From e48fa711a3664bece9b3e58840a75fe7c05bc47c Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期六, 08 五月 2021 17:14:05 +0800
Subject: [PATCH] 添加截图（快照）功能
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
index ca4ebae..be9fdff 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -1,9 +1,7 @@
package com.genersoft.iot.vmp.storager;
-import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.common.RealVideo;
import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
@@ -39,20 +37,20 @@
StreamInfo queryPlaybackByStreamId(String steamId);
- StreamInfo queryPlayByDevice(String deviceId, String code);
+ StreamInfo queryPlayByDevice(String deviceId, String channelId);
/**
* 鏇存柊娴佸獟浣撲俊鎭�
- * @param mediaServerConfig
+ * @param ZLMServerConfig
* @return
*/
- boolean updateMediaInfo(MediaServerConfig mediaServerConfig);
+ boolean updateMediaInfo(ZLMServerConfig ZLMServerConfig);
/**
* 鑾峰彇娴佸獟浣撲俊鎭�
* @return
*/
- MediaServerConfig getMediaInfo();
+ ZLMServerConfig getMediaInfo();
Map<String, StreamInfo> queryPlayByDeviceId(String deviceId);
@@ -94,6 +92,8 @@
*/
SendRtpItem querySendRTPServer(String platformGbId, String channelId);
+ List<SendRtpItem> querySendRTPServer(String platformGbId);
+
/**
* 鍒犻櫎RTP鎺ㄩ�佷俊鎭紦瀛�
* @param platformGbId
@@ -108,14 +108,8 @@
boolean isChannelSendingRTP(String channelId);
/**
- * 鏇存柊濯掍綋娴佸垪琛�
- * @param mediaList
+ * 娓呯┖鏌愪釜璁惧鐨勬墍鏈夌紦瀛�
+ * @param deviceId 璁惧ID
*/
- void updateMediaList(List<RealVideo> mediaList);
-
- /**
- * 鑾峰彇褰撳墠濯掍綋娴佸垪琛�
- * @return List<RealVideo>
- */
- JSONObject getMediaList(int start, int end);
+ void clearCatchByDeviceId(String deviceId);
}
--
Gitblit v1.8.0