From 9ef1a0277b23c0302891d74648e0b559423dcbb8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 18 五月 2022 15:36:33 +0800
Subject: [PATCH] 更新jessibuca播放器
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 70 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 31 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 ea85cf1..4a3aa78 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -3,8 +3,12 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.*;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
+import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.service.bean.ThirdPartyGB;
import java.util.List;
@@ -44,17 +48,15 @@
StreamInfo queryPlayByStreamId(String steamId);
- StreamInfo queryPlaybackByStreamId(String steamId);
-
StreamInfo queryPlayByDevice(String deviceId, String channelId);
Map<String, StreamInfo> queryPlayByDeviceId(String deviceId);
- boolean startPlayback(StreamInfo stream);
+ boolean startPlayback(StreamInfo stream, String callId);
- boolean stopPlayback(StreamInfo streamInfo);
+ boolean stopPlayback(String deviceId, String channelId, String stream, String callId);
- StreamInfo queryPlaybackByDevice(String deviceId, String code);
+ StreamInfo queryPlayback(String deviceId, String channelID, String stream, String callId);
void updatePlatformCatchInfo(ParentPlatformCatch parentPlatformCatch);
@@ -86,7 +88,7 @@
* @param channelId
* @return sendRtpItem
*/
- SendRtpItem querySendRTPServer(String platformGbId, String channelId);
+ SendRtpItem querySendRTPServer(String platformGbId, String channelId, String streamId, String callId);
List<SendRtpItem> querySendRTPServer(String platformGbId);
@@ -95,7 +97,7 @@
* @param platformGbId
* @param channelId
*/
- void deleteSendRTPServer(String platformGbId, String channelId);
+ void deleteSendRTPServer(String platformGbId, String channelId, String callId, String streamId);
/**
* 鏌ヨ鏌愪釜閫氶亾鏄惁瀛樺湪涓婄骇鐐规挱锛圧TP鎺ㄩ�侊級
@@ -110,23 +112,6 @@
void clearCatchByDeviceId(String deviceId);
/**
- * 鑾峰彇mediaServer鑺傜偣
- * @param mediaServerId
- * @return
- */
-// MediaServerItem getMediaInfo(String mediaServerId);
-
- /**
- * 璁剧疆鎵�鏈夎澶囩绾�
- */
- void outlineForAll();
-
- /**
- * 鑾峰彇鎵�鏈夊湪绾跨殑
- */
- List<String> getOnlineForAll();
-
- /**
* 鍦╮edis娣诲姞wvp鐨勪俊鎭�
*/
void updateWVPInfo(JSONObject jsonObject, int time);
@@ -138,12 +123,18 @@
void sendStreamChangeMsg(String type, JSONObject jsonObject);
/**
+ * 鍙戦�佹姤璀︽秷鎭�
+ * @param msg 娑堟伅鍐呭
+ */
+ void sendAlarmMsg(AlarmChannelMessage msg);
+
+ /**
* 娣诲姞娴佷俊鎭埌redis
* @param mediaServerItem
* @param app
* @param streamId
*/
- void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, StreamInfo streamInfo);
+ void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, MediaItem item);
/**
* 绉婚櫎娴佷俊鎭粠redis
@@ -164,9 +155,11 @@
* 寮�濮嬩笅杞藉綍鍍忔椂瀛樺叆
* @param streamInfo
*/
- boolean startDownload(StreamInfo streamInfo);
+ boolean startDownload(StreamInfo streamInfo, String callId);
- StreamInfo queryDownloadByStreamId(String streamId);
+ StreamInfo queryDownload(String deviceId, String channelId, String stream, String callId);
+
+ boolean stopDownload(String deviceId, String channelId, String stream, String callId);
/**
* 鏌ユ壘绗笁鏂圭郴缁熺暀涓嬬殑鍥芥爣棰勮鍊�
@@ -175,7 +168,7 @@
*/
ThirdPartyGB queryMemberNoGBId(String queryKey);
- List<StreamInfo> getStreams(String mediaServerId, String pull);
+ List<MediaItem> getStreams(String mediaServerId, String pull);
/**
* 灏哾evice淇℃伅鍐欏叆redis
@@ -195,14 +188,29 @@
void updateGpsMsgInfo(GPSMsgInfo gpsMsgInfo);
GPSMsgInfo getGpsMsgInfo(String gbId);
+ List<GPSMsgInfo> getAllGpsMsgInfo();
Long getSN(String method);
void resetAllSN();
- void updateSubscribe(String key, SubscribeInfo subscribeInfo);
+ MediaItem getStreamInfo(String app, String streamId, String mediaServerId);
- SubscribeInfo getSubscribe(String key);
+ void addCpuInfo(double cpuInfo);
- void delSubscribe(String key);
+ void addMemInfo(double memInfo);
+
+ void addNetInfo(Map<String, String> networkInterfaces);
+
+ void sendMobilePositionMsg(JSONObject jsonObject);
+
+ void sendStreamPushRequestedMsg(MessageForPushChannel messageForPushChannel);
+
+ /**
+ * 鍒ゆ柇璁惧鐘舵��
+ * @param deviceId 璁惧ID
+ * @return
+ */
+ public boolean deviceIsOnline(String deviceId);
+
}
--
Gitblit v1.8.0