From fbdad00cdb294a857f55e33b2dd92c61dc37475c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 13 十月 2020 18:55:42 +0800
Subject: [PATCH] 修复无音频通道开启通道音频后无法播放的bug 修复点播接口真的收到视频后回复
---
src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
index e1411ab..38a6476 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
@@ -80,11 +80,10 @@
String channelId = channel.getChannelId();
HashMap<String, HashSet<String>> channelMap = deviceMap.get(deviceId);
if (channelMap == null) return;
-
// 浣滀负鐖惰澶�, 纭畾鑷繁鐨勫瓙鑺傜偣鏁�
if (channelMap.get(channelId) == null) {
channelMap.put(channelId, new HashSet<String>());
- }else if (channelMap.get(channelId).size()> 0) {
+ }else if (channelMap.get(channelId).size() > 0) {
channel.setSubCount(channelMap.get(channelId).size());
}
@@ -107,7 +106,7 @@
if (!StringUtils.isEmpty(parentId)) {
if (channelMap.get(parentId) == null) {
- channelMap.put(parentId, new HashSet<>());
+ channelMap.put(parentId, new HashSet<String>());
}
channelMap.get(parentId).add(channelId);
@@ -330,40 +329,54 @@
/**
* 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆redis
*
- * @param deviceId 璁惧ID
- * @param channelId 閫氶亾ID
* @return
*/
@Override
- public boolean startPlay(String deviceId, String channelId, StreamInfo stream) {
- return redis.set(String.format("%S_%s_%s", VideoManagerConstants.PLAYER_PREFIX, deviceId, channelId),
+ public boolean startPlay(StreamInfo stream) {
+ return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, stream.getSsrc(),stream.getDeviceID(), stream.getCahnnelId()),
stream);
}
/**
* 鍋滄鎾斁鏃朵粠redis鍒犻櫎
*
- * @param deviceId 璁惧ID
- * @param channelId 閫氶亾ID
* @return
*/
@Override
- public boolean stopPlay(String deviceId, String channelId) {
- return redis.del(String.format("%S_%s_%s", VideoManagerConstants.PLAYER_PREFIX, deviceId, channelId));
+ public boolean stopPlay(StreamInfo streamInfo) {
+ if (streamInfo == null) return false;
+ return redis.del(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
+ streamInfo.getSsrc(),
+ streamInfo.getDeviceID(),
+ streamInfo.getCahnnelId()));
}
/**
* 鏌ヨ鎾斁鍒楄〃
- * @param deviceId 璁惧ID
- * @param channelId 閫氶亾ID
* @return
*/
@Override
- public StreamInfo queryPlay(String deviceId, String channelId) {
- return (StreamInfo)redis.get(String.format("%S_%s_%s", VideoManagerConstants.PLAYER_PREFIX, deviceId, channelId));
+ public StreamInfo queryPlay(StreamInfo streamInfo) {
+ return (StreamInfo)redis.get(String.format("%S_%s_%s_%s",
+ VideoManagerConstants.PLAYER_PREFIX,
+ streamInfo.getSsrc(),
+ streamInfo.getDeviceID(),
+ streamInfo.getCahnnelId()));
+ }
+ @Override
+ public StreamInfo queryPlayBySSRC(String ssrc) {
+ List<Object> playLeys = redis.keys(String.format("%S_%s_*", VideoManagerConstants.PLAYER_PREFIX, ssrc));
+ if (playLeys.size() == 0) return null;
+ return (StreamInfo)redis.get(playLeys.get(0).toString());
}
-
+ @Override
+ public StreamInfo queryPlayByDevice(String deviceId, String code) {
+ List<Object> playLeys = redis.keys(String.format("%S_*_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
+ deviceId,
+ code));
+ return (StreamInfo)redis.get(playLeys.get(0).toString());
+ }
/**
* 鏇存柊娴佸獟浣撲俊鎭�
@@ -399,19 +412,32 @@
for (int i = 0; i < deviceChannelList.size(); i++) {
String key = (String)deviceChannelList.get(i);
String[] s = key.split("_");
- String channelId = s[3];
+ String channelId = s[3].split(":")[0];
HashSet<String> subChannel = channelMap.get(channelId);
if (subChannel == null) {
subChannel = new HashSet<>();
}
- if (s.length > 4) {
- subChannel.add(s[4]);
+ if (!"null".equals(s[6])) {
+ subChannel.add(s[6]);
}
channelMap.put(channelId, subChannel);
- System.out.println();
}
}
deviceMap.put(device.getDeviceId(),channelMap);
}
}
+
+ @Override
+ public void cleanChannelsForDevice(String deviceId) {
+ List<DeviceChannel> result = new ArrayList<>();
+ List<Object> deviceChannelList = redis.keys(VideoManagerConstants.CACHEKEY_PREFIX + deviceId + "_" + "*");
+ if (deviceChannelList != null && deviceChannelList.size() > 0 ) {
+ for (int i = 0; i < deviceChannelList.size(); i++) {
+ redis.del((String)deviceChannelList.get(i));
+ }
+ }
+ }
+
+
+
}
--
Gitblit v1.8.0