From 2c1dbe63de3d370d0b0f20fea474326e88b9ca23 Mon Sep 17 00:00:00 2001 From: lawrencehj <1934378145@qq.com> Date: 星期三, 10 三月 2021 14:39:40 +0800 Subject: [PATCH] 增加接收Bye请求后停止向上级推流功能 --- src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 98 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 80 insertions(+), 18 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 cebb30b..6153e5f 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 @@ -3,7 +3,7 @@ import com.genersoft.iot.vmp.common.StreamInfo; import com.genersoft.iot.vmp.common.VideoManagerConstants; import com.genersoft.iot.vmp.conf.MediaServerConfig; -import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; +import com.genersoft.iot.vmp.gb28181.bean.*; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper; import com.genersoft.iot.vmp.utils.redis.RedisUtil; @@ -11,7 +11,6 @@ import org.springframework.stereotype.Component; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; @@ -32,7 +31,7 @@ */ @Override public boolean startPlay(StreamInfo stream) { - return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, stream.getStreamId(),stream.getDeviceID(), stream.getCahnnelId()), + return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, stream.getStreamId(),stream.getDeviceID(), stream.getChannelId()), stream); } @@ -44,16 +43,10 @@ @Override public boolean stopPlay(StreamInfo streamInfo) { if (streamInfo == null) return false; - DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(streamInfo.getDeviceID(), streamInfo.getCahnnelId()); - if (deviceChannel != null) { - deviceChannel.setStreamId(null); - deviceChannel.setDeviceId(streamInfo.getDeviceID()); - deviceChannelMapper.update(deviceChannel); - } return redis.del(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, streamInfo.getStreamId(), streamInfo.getDeviceID(), - streamInfo.getCahnnelId())); + streamInfo.getChannelId())); } /** @@ -66,7 +59,7 @@ VideoManagerConstants.PLAYER_PREFIX, streamInfo.getStreamId(), streamInfo.getDeviceID(), - streamInfo.getCahnnelId())); + streamInfo.getChannelId())); } @Override public StreamInfo queryPlayByStreamId(String steamId) { @@ -120,7 +113,7 @@ for (int i = 0; i < players.size(); i++) { String key = (String) players.get(i); StreamInfo streamInfo = (StreamInfo)redis.get(key); - streamInfos.put(streamInfo.getDeviceID() + "_" + streamInfo.getCahnnelId(), streamInfo); + streamInfos.put(streamInfo.getDeviceID() + "_" + streamInfo.getChannelId(), streamInfo); } return streamInfos; } @@ -128,7 +121,7 @@ @Override public boolean startPlayback(StreamInfo stream) { - return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, stream.getStreamId(),stream.getDeviceID(), stream.getCahnnelId()), + return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, stream.getStreamId(),stream.getDeviceID(), stream.getChannelId()), stream); } @@ -136,7 +129,7 @@ @Override public boolean stopPlayback(StreamInfo streamInfo) { if (streamInfo == null) return false; - DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(streamInfo.getDeviceID(), streamInfo.getCahnnelId()); + DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(streamInfo.getDeviceID(), streamInfo.getChannelId()); if (deviceChannel != null) { deviceChannel.setStreamId(null); deviceChannel.setDeviceId(streamInfo.getDeviceID()); @@ -145,14 +138,14 @@ return redis.del(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, streamInfo.getStreamId(), streamInfo.getDeviceID(), - streamInfo.getCahnnelId())); + streamInfo.getChannelId())); } @Override public StreamInfo queryPlaybackByDevice(String deviceId, String code) { - String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, - deviceId, - code); + // String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, + // deviceId, + // code); List<Object> playLeys = redis.scan(String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, deviceId, code)); @@ -163,4 +156,73 @@ if (playLeys == null || playLeys.size() == 0) return null; return (StreamInfo)redis.get(playLeys.get(0).toString()); } + + @Override + public void updatePlatformCatchInfo(ParentPlatformCatch parentPlatformCatch) { + String key = VideoManagerConstants.PLATFORM_CATCH_PREFIX + parentPlatformCatch.getId(); + redis.set(key, parentPlatformCatch); + } + + @Override + public void updatePlatformKeepalive(ParentPlatform parentPlatform) { + String key = VideoManagerConstants.PLATFORM_KEEPLIVEKEY_PREFIX + parentPlatform.getServerGBId(); + redis.set(key, "", Integer.parseInt(parentPlatform.getKeepTimeout())); + } + + @Override + public void updatePlatformRegister(ParentPlatform parentPlatform) { + String key = VideoManagerConstants.PLATFORM_REGISTER_PREFIX + parentPlatform.getServerGBId(); + redis.set(key, "", Integer.parseInt(parentPlatform.getExpires())); + } + + @Override + public ParentPlatformCatch queryPlatformCatchInfo(String platformGbId) { + return (ParentPlatformCatch)redis.get(VideoManagerConstants.PLATFORM_CATCH_PREFIX + platformGbId); + } + + @Override + public void delPlatformCatchInfo(String platformGbId) { + redis.del(VideoManagerConstants.PLATFORM_CATCH_PREFIX + platformGbId); + } + + @Override + public void delPlatformKeepalive(String platformGbId) { + redis.del(VideoManagerConstants.PLATFORM_KEEPLIVEKEY_PREFIX + platformGbId); + } + + @Override + public void delPlatformRegister(String platformGbId) { + redis.del(VideoManagerConstants.PLATFORM_REGISTER_PREFIX + platformGbId); + } + + + @Override + public void updatePlatformRegisterInfo(String callId, String platformGbId) { + String key = VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + callId; + redis.set(key, platformGbId); + } + + + @Override + public String queryPlatformRegisterInfo(String callId) { + return (String)redis.get(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + callId); + } + + @Override + public void delPlatformRegisterInfo(String callId) { + redis.del(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + callId); + } + + @Override + public void updateSendRTPSever(SendRtpItem sendRtpItem) { + String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + sendRtpItem.getPlatformId() + "_" + sendRtpItem.getChannelId(); + redis.set(key, sendRtpItem); + } + + @Override + public SendRtpItem querySendRTPServer(String platformGbId, String channelId) { + String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + platformGbId + "_" + channelId; + return (SendRtpItem)redis.get(key); + } + } -- Gitblit v1.8.0