From 6d52e1539f6c33d5b625ff7fd56bccf8b76971b3 Mon Sep 17 00:00:00 2001
From: shanyuanzz <46706605+shanyuanzz@users.noreply.github.com>
Date: 星期日, 28 五月 2023 13:48:55 +0800
Subject: [PATCH] 优化zoom低倍速下的变倍速率
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 327 +----------------------------------------------------
1 files changed, 11 insertions(+), 316 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
index d4abcb4..98327ab 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
@@ -2,17 +2,18 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.common.SystemAllInfo;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.UserSetting;
-import com.genersoft.iot.vmp.gb28181.bean.*;
-import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
+import com.genersoft.iot.vmp.gb28181.bean.AlarmChannelMessage;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
+import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
-import com.genersoft.iot.vmp.service.bean.ThirdPartyGB;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
@@ -92,241 +93,6 @@
}
}
- /**
- * 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆redis
- */
- @Override
- public boolean startPlay(StreamInfo stream) {
-
- redisTemplate.opsForValue().set(String.format("%S_%s_%s_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, userSetting.getServerId(),
- stream.getMediaServerId(), stream.getStream(), stream.getDeviceID(), stream.getChannelId()),
- stream);
- return true;
- }
-
- /**
- * 鍋滄鎾斁鏃朵粠redis鍒犻櫎
- */
- @Override
- public boolean stopPlay(StreamInfo streamInfo) {
- if (streamInfo == null) {
- return false;
- }
- Boolean result = redisTemplate.delete(String.format("%S_%s_%s_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
- userSetting.getServerId(),
- streamInfo.getMediaServerId(),
- streamInfo.getStream(),
- streamInfo.getDeviceID(),
- streamInfo.getChannelId()));
- return result != null && result;
- }
-
- /**
- * 鏌ヨ鎾斁鍒楄〃
- */
- @Override
- public StreamInfo queryPlay(StreamInfo streamInfo) {
- return (StreamInfo)redisTemplate.opsForValue().get(String.format("%S_%s_%s_%s_%s_%s",
- VideoManagerConstants.PLAYER_PREFIX,
- userSetting.getServerId(),
- streamInfo.getMediaServerId(),
- streamInfo.getStream(),
- streamInfo.getDeviceID(),
- streamInfo.getChannelId()));
- }
- @Override
- public StreamInfo queryPlayByStreamId(String streamId) {
- List<Object> playLeys = RedisUtil.scan(redisTemplate, String.format("%S_%s_*_%s_*", VideoManagerConstants.PLAYER_PREFIX, userSetting.getServerId(), streamId));
- if (playLeys.size() == 0) {
- return null;
- }
- return (StreamInfo)redisTemplate.opsForValue().get(playLeys.get(0).toString());
- }
-
- @Override
- public StreamInfo queryPlayByDevice(String deviceId, String channelId) {
- List<Object> playLeys = RedisUtil.scan(redisTemplate, String.format("%S_%s_*_*_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
- userSetting.getServerId(),
- deviceId,
- channelId));
- if (playLeys.size() == 0) {
- return null;
- }
- return (StreamInfo)redisTemplate.opsForValue().get(playLeys.get(0).toString());
- }
-
- @Override
- public Map<String, StreamInfo> queryPlayByDeviceId(String deviceId) {
- Map<String, StreamInfo> streamInfos = new HashMap<>();
- List<Object> players = RedisUtil.scan(redisTemplate, String.format("%S_%s_*_*_%s_*", VideoManagerConstants.PLAYER_PREFIX, userSetting.getServerId(),deviceId));
- if (players.size() == 0) {
- return streamInfos;
- }
- for (Object player : players) {
- String key = (String) player;
- StreamInfo streamInfo = JsonUtil.redisJsonToObject(redisTemplate, key, StreamInfo.class);
- if (Objects.isNull(streamInfo)) {
- continue;
- }
- streamInfos.put(streamInfo.getDeviceID() + "_" + streamInfo.getChannelId(), streamInfo);
- }
- return streamInfos;
- }
-
-
- @Override
- public boolean startPlayback(StreamInfo stream, String callId) {
- redisTemplate.opsForValue().set(String.format("%S_%s_%s_%s_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
- userSetting.getServerId(), stream.getMediaServerId(), stream.getDeviceID(), stream.getChannelId(), stream.getStream(), callId), stream);
- return true;
- }
-
- @Override
- public boolean startDownload(StreamInfo stream, String callId) {
- String key=String.format("%S_%s_%s_%s_%s_%s_%s", VideoManagerConstants.DOWNLOAD_PREFIX,
- userSetting.getServerId(), stream.getMediaServerId(), stream.getDeviceID(), stream.getChannelId(), stream.getStream(), callId);
- if (stream.getProgress() == 1) {
- logger.debug("娣诲姞涓嬭浇缂撳瓨==宸插畬鎴愪笅杞�=銆媨}",key);
- redisTemplate.opsForValue().set(key, stream);
- }else {
- logger.debug("娣诲姞涓嬭浇缂撳瓨==鏈畬鎴愪笅杞�=銆媨}",key);
- Duration duration = Duration.ofSeconds(60*60L);
- redisTemplate.opsForValue().set(key, stream, duration);
- }
- return true;
- }
- @Override
- public boolean stopDownload(String deviceId, String channelId, String stream, String callId) {
- DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(deviceId, channelId);
- if (deviceChannel != null) {
- deviceChannel.setStreamId(null);
- deviceChannel.setDeviceId(deviceId);
- deviceChannelMapper.update(deviceChannel);
- }
- if (deviceId == null) {
- deviceId = "*";
- }
- if (channelId == null) {
- channelId = "*";
- }
- if (stream == null) {
- stream = "*";
- }
- if (callId == null) {
- callId = "*";
- }
- String key = String.format("%S_%s_*_%s_%s_%s_%s", VideoManagerConstants.DOWNLOAD_PREFIX,
- userSetting.getServerId(),
- deviceId,
- channelId,
- stream,
- callId
- );
- List<Object> scan = RedisUtil.scan(redisTemplate, key);
- if (scan.size() > 0) {
- for (Object keyObj : scan) {
- redisTemplate.delete(keyObj);
- }
- }
- return true;
- }
-
- @Override
- public boolean stopPlayback(String deviceId, String channelId, String stream, String callId) {
- DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(deviceId, channelId);
- if (deviceChannel != null) {
- deviceChannel.setStreamId(null);
- deviceChannel.setDeviceId(deviceId);
- deviceChannelMapper.update(deviceChannel);
- }
- if (deviceId == null) {
- deviceId = "*";
- }
- if (channelId == null) {
- channelId = "*";
- }
- if (stream == null) {
- stream = "*";
- }
- if (callId == null) {
- callId = "*";
- }
- String key = String.format("%S_%s_*_%s_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
- userSetting.getServerId(),
- deviceId,
- channelId,
- stream,
- callId
- );
- List<Object> scan = RedisUtil.scan(redisTemplate, key);
- if (scan.size() > 0) {
- for (Object keyObj : scan) {
- redisTemplate.delete(keyObj);
- }
- }
- return true;
- }
-
- @Override
- public StreamInfo queryPlayback(String deviceId, String channelId, String stream, String callId) {
- if (stream == null && callId == null) {
- return null;
- }
- if (deviceId == null) {
- deviceId = "*";
- }
- if (channelId == null) {
- channelId = "*";
- }
- if (stream == null) {
- stream = "*";
- }
- if (callId == null) {
- callId = "*";
- }
- String key = String.format("%S_%s_*_%s_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
- userSetting.getServerId(),
- deviceId,
- channelId,
- stream,
- callId
- );
- List<Object> streamInfoScan = RedisUtil.scan(redisTemplate, key);
- if (streamInfoScan.size() > 0) {
- return (StreamInfo) redisTemplate.opsForValue().get(streamInfoScan.get(0));
- }else {
- return null;
- }
- }
-
- @Override
- public String queryPlaybackForKey(String deviceId, String channelId, String stream, String callId) {
- if (stream == null && callId == null) {
- return null;
- }
- if (deviceId == null) {
- deviceId = "*";
- }
- if (channelId == null) {
- channelId = "*";
- }
- if (stream == null) {
- stream = "*";
- }
- if (callId == null) {
- callId = "*";
- }
- String key = String.format("%S_%s_*_%s_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
- userSetting.getServerId(),
- deviceId,
- channelId,
- stream,
- callId
- );
- List<Object> streamInfoScan = RedisUtil.scan(redisTemplate, key);
- return (String) streamInfoScan.get(0);
- }
-
@Override
public void updatePlatformCatchInfo(ParentPlatformCatch parentPlatformCatch) {
String key = VideoManagerConstants.PLATFORM_CATCH_PREFIX + userSetting.getServerId() + "_" + parentPlatformCatch.getId();
@@ -370,14 +136,6 @@
@Override
public void delPlatformRegisterInfo(String callId) {
redisTemplate.delete(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetting.getServerId() + "_" + callId);
- }
-
- @Override
- public void cleanPlatformRegisterInfos() {
- List regInfos = RedisUtil.scan(redisTemplate, VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetting.getServerId() + "_" + "*");
- for (Object key : regInfos) {
- redisTemplate.delete(key.toString());
- }
}
@Override
@@ -537,36 +295,6 @@
}
@Override
- public void clearCatchByDeviceId(String deviceId) {
- List<Object> playLeys = RedisUtil.scan(redisTemplate, String.format("%S_%s_*_%s_*", VideoManagerConstants.PLAYER_PREFIX,
- userSetting.getServerId(),
- deviceId));
- if (playLeys.size() > 0) {
- for (Object key : playLeys) {
- redisTemplate.delete(key.toString());
- }
- }
-
- List<Object> playBackers = RedisUtil.scan(redisTemplate, String.format("%S_%s_*_%s_*_*_*", VideoManagerConstants.PLAY_BLACK_PREFIX,
- userSetting.getServerId(),
- deviceId));
- if (playBackers.size() > 0) {
- for (Object key : playBackers) {
- redisTemplate.delete(key.toString());
- }
- }
-
- List<Object> deviceCache = RedisUtil.scan(redisTemplate, String.format("%S%s_%s", VideoManagerConstants.DEVICE_PREFIX,
- userSetting.getServerId(),
- deviceId));
- if (deviceCache.size() > 0) {
- for (Object key : deviceCache) {
- redisTemplate.delete(key.toString());
- }
- }
- }
-
- @Override
public void updateWVPInfo(JSONObject jsonObject, int time) {
String key = VideoManagerConstants.WVP_SERVER_PREFIX + userSetting.getServerId();
Duration duration = Duration.ofSeconds(time);
@@ -595,44 +323,6 @@
public void removeStream(String mediaServerId, String type, String app, String streamId) {
String key = VideoManagerConstants.WVP_SERVER_STREAM_PREFIX + userSetting.getServerId() + "_" + type + "_" + app + "_" + streamId + "_" + mediaServerId;
redisTemplate.delete(key);
- }
-
- @Override
- public StreamInfo queryDownload(String deviceId, String channelId, String stream, String callId) {
- if (stream == null && callId == null) {
- return null;
- }
- if (deviceId == null) {
- deviceId = "*";
- }
- if (channelId == null) {
- channelId = "*";
- }
- if (stream == null) {
- stream = "*";
- }
- if (callId == null) {
- callId = "*";
- }
- String key = String.format("%S_%s_*_%s_%s_%s_%s", VideoManagerConstants.DOWNLOAD_PREFIX,
- userSetting.getServerId(),
- deviceId,
- channelId,
- stream,
- callId
- );
- List<Object> streamInfoScan = RedisUtil.scan(redisTemplate, key);
- if (streamInfoScan.size() > 0) {
- return (StreamInfo) redisTemplate.opsForValue().get(streamInfoScan.get(0));
- }else {
- return null;
- }
- }
-
- @Override
- public ThirdPartyGB queryMemberNoGBId(String queryKey) {
- String key = VideoManagerConstants.WVP_STREAM_GB_ID_PREFIX + queryKey;
- return JsonUtil.redisJsonToObject(redisTemplate, key, ThirdPartyGB.class);
}
@Override
@@ -915,7 +605,12 @@
@Override
public void sendDeviceOrChannelStatus(String deviceId, String channelId, boolean online) {
String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_DEVICE_STATUS;
- logger.info("[redis閫氱煡] 鎺ㄩ�佽澶�/閫氶亾鐘舵�侊紝 {}/{}-{}", deviceId, channelId, online);
+ if (channelId == null) {
+ logger.info("[redis閫氱煡] 鎺ㄩ�佽澶囩姸鎬侊紝 {}-{}", deviceId, online);
+ }else {
+ logger.info("[redis閫氱煡] 鎺ㄩ�侀�氶亾鐘舵�侊紝 {}/{}-{}", deviceId, channelId, online);
+ }
+
StringBuilder msg = new StringBuilder();
msg.append(deviceId);
if (channelId != null) {
--
Gitblit v1.8.0