From 61fc5b656a8dc48e4f0ad66577e39a93683b620a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 02 十一月 2021 16:59:22 +0800
Subject: [PATCH] 修复错误的类型判断导致的过期事件无法监听
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index 18c1b93..4ba361c 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -96,6 +96,11 @@
@Override
public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId) {
+ return openRTPServer(mediaServerItem, streamId, false);
+ }
+
+ @Override
+ public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean isPlayback) {
if (mediaServerItem == null || mediaServerItem.getId() == null) {
return null;
}
@@ -107,7 +112,13 @@
logger.info("media server [ {} ] ssrcConfig is null", mediaServerItem.getId());
return null;
}else {
- String ssrc = ssrcConfig.getPlaySsrc();
+ String ssrc = null;
+ if (isPlayback) {
+ ssrc = ssrcConfig.getPlayBackSsrc();
+ }else {
+ ssrc = ssrcConfig.getPlaySsrc();
+ }
+
if (streamId == null) {
streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
}
@@ -519,4 +530,12 @@
return result;
}
+
+ @Override
+ public void delete(String id) {
+ redisUtil.zRemove(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX, id);
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + id;
+ redisUtil.del(key);
+ mediaServerMapper.delOne(id);
+ }
}
--
Gitblit v1.8.0