From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java | 992 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 566 insertions(+), 426 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
index b483e6b..a0b3341 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
@@ -1,24 +1,26 @@
package com.genersoft.iot.vmp.media.service.impl;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.genersoft.iot.vmp.common.CommonCallback;
+import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
-import com.genersoft.iot.vmp.conf.DynamicTask;
-import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
-import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.gb28181.session.SSRCFactory;
+import com.genersoft.iot.vmp.media.bean.MediaInfo;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
+import com.genersoft.iot.vmp.media.event.media.MediaArrivalEvent;
+import com.genersoft.iot.vmp.media.event.media.MediaDepartureEvent;
+import com.genersoft.iot.vmp.media.event.mediaServer.MediaServerChangeEvent;
+import com.genersoft.iot.vmp.media.event.mediaServer.MediaServerDeleteEvent;
import com.genersoft.iot.vmp.media.service.IMediaNodeServerService;
-import com.genersoft.iot.vmp.media.zlm.*;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.media.zlm.dto.ServerKeepaliveData;
-import com.genersoft.iot.vmp.media.zlm.dto.ZLMServerConfig;
-import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.media.service.IMediaServerService;
+import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.OriginType;
+import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
@@ -27,21 +29,20 @@
import com.genersoft.iot.vmp.utils.JsonUtil;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.event.EventListener;
import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
import org.springframework.util.ObjectUtils;
-import java.io.File;
import java.time.LocalDateTime;
import java.util.*;
@@ -54,47 +55,14 @@
private final static Logger logger = LoggerFactory.getLogger(MediaServerServiceImpl.class);
- private final String zlmKeepaliveKeyPrefix = "zlm-keepalive_";
-
- @Autowired
- private SipConfig sipConfig;
-
@Autowired
private SSRCFactory ssrcFactory;
-
- @Value("${server.ssl.enabled:false}")
- private boolean sslEnabled;
-
- @Value("${server.port}")
- private Integer serverPort;
@Autowired
private UserSetting userSetting;
@Autowired
- private SendRtpPortManager sendRtpPortManager;
-
- @Autowired
- private AssistRESTfulUtils assistRESTfulUtils;
-
- @Autowired
private MediaServerMapper mediaServerMapper;
-
- @Autowired
- private DataSourceTransactionManager dataSourceTransactionManager;
-
- @Autowired
- private TransactionDefinition transactionDefinition;
-
-
- @Autowired
- private ZLMServerFactory zlmServerFactory;
-
- @Autowired
- private EventPublisher publisher;
-
- @Autowired
- private DynamicTask dynamicTask;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -108,36 +76,81 @@
@Autowired
private Map<String, IMediaNodeServerService> nodeServerServiceMap;
+ @Autowired
+ private ApplicationEventPublisher applicationEventPublisher;
+
+ @Autowired
+ private MediaConfig mediaConfig;
+
+ @Autowired
+ private SendRtpPortManager sendRtpPortManager;
+
+
+
+ /**
+ * 娴佸埌鏉ョ殑澶勭悊
+ */
+ @Async("taskExecutor")
+ @org.springframework.context.event.EventListener
+ public void onApplicationEvent(MediaArrivalEvent event) {
+ if ("rtsp".equals(event.getSchema())) {
+ logger.info("娴佸彉鍖栵細娉ㄥ唽 app->{}, stream->{}", event.getApp(), event.getStream());
+ addCount(event.getMediaServer().getId());
+ String type = OriginType.values()[event.getMediaInfo().getOriginType()].getType();
+ redisCatchStorage.addStream(event.getMediaServer(), type, event.getApp(), event.getStream(), event.getMediaInfo());
+ }
+ }
+
+ /**
+ * 娴佺寮�鐨勫鐞�
+ */
+ @Async("taskExecutor")
+ @EventListener
+ public void onApplicationEvent(MediaDepartureEvent event) {
+ if ("rtsp".equals(event.getSchema())) {
+ logger.info("娴佸彉鍖栵細娉ㄩ攢, app->{}, stream->{}", event.getApp(), event.getStream());
+ removeCount(event.getMediaServer().getId());
+ MediaInfo mediaInfo = redisCatchStorage.getStreamInfo(
+ event.getApp(), event.getStream(), event.getMediaServer().getId());
+ if (mediaInfo == null) {
+ return;
+ }
+ String type = OriginType.values()[mediaInfo.getOriginType()].getType();
+ redisCatchStorage.removeStream(mediaInfo.getMediaServer().getId(), type, event.getApp(), event.getStream());
+ }
+
+ }
+
/**
* 鍒濆鍖�
*/
@Override
- public void updateVmServer(List<MediaServerItem> mediaServerItemList) {
+ public void updateVmServer(List<MediaServer> mediaServerList) {
logger.info("[濯掍綋鏈嶅姟鑺傜偣] 缂撳瓨鍒濆鍖� ");
- for (MediaServerItem mediaServerItem : mediaServerItemList) {
- if (ObjectUtils.isEmpty(mediaServerItem.getId())) {
+ for (MediaServer mediaServer : mediaServerList) {
+ if (ObjectUtils.isEmpty(mediaServer.getId())) {
continue;
}
// 鏇存柊
- if (!ssrcFactory.hasMediaServerSSRC(mediaServerItem.getId())) {
- ssrcFactory.initMediaServerSSRC(mediaServerItem.getId(), null);
+ if (!ssrcFactory.hasMediaServerSSRC(mediaServer.getId())) {
+ ssrcFactory.initMediaServerSSRC(mediaServer.getId(), null);
}
// 鏌ヨredis鏄惁瀛樺湪姝ediaServer
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + ":" + mediaServer.getId();
Boolean hasKey = redisTemplate.hasKey(key);
if (hasKey != null && ! hasKey) {
- redisTemplate.opsForValue().set(key, mediaServerItem);
+ redisTemplate.opsForValue().set(key, mediaServer);
}
}
}
@Override
- public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String presetSsrc, boolean ssrcCheck,
- boolean isPlayback, Integer port, Boolean onlyAuto, Boolean reUsePort, Integer tcpMode) {
- if (mediaServerItem == null || mediaServerItem.getId() == null) {
- logger.info("[openRTPServer] 澶辫触, mediaServerItem == null || mediaServerItem.getId() == null");
+ public SSRCInfo openRTPServer(MediaServer mediaServer, String streamId, String presetSsrc, boolean ssrcCheck,
+ boolean isPlayback, Integer port, Boolean onlyAuto, Boolean disableAudio, Boolean reUsePort, Integer tcpMode) {
+ if (mediaServer == null || mediaServer.getId() == null) {
+ logger.info("[openRTPServer] 澶辫触, mediaServer == null || mediaServer.getId() == null");
return null;
}
// 鑾峰彇mediaServer鍙敤鐨剆src
@@ -146,9 +159,9 @@
ssrc = presetSsrc;
}else {
if (isPlayback) {
- ssrc = ssrcFactory.getPlayBackSsrc(mediaServerItem.getId());
+ ssrc = ssrcFactory.getPlayBackSsrc(mediaServer.getId());
}else {
- ssrc = ssrcFactory.getPlaySsrc(mediaServerItem.getId());
+ ssrc = ssrcFactory.getPlaySsrc(mediaServer.getId());
}
}
@@ -160,132 +173,136 @@
logger.warn("[openRTPServer] 骞冲彴瀵规帴鏃朵笅绾у彲鑳借嚜瀹氫箟ssrc锛屼絾鏄痶cp妯″紡zlm鏀舵祦鐩墠鏃犳硶鏇存柊ssrc锛屽彲鑳芥敹娴佽秴鏃讹紝姝ゆ椂璇蜂娇鐢╱dp鏀舵祦鎴栬�呭叧闂璼src鏍￠獙");
}
int rtpServerPort;
- if (mediaServerItem.isRtpEnable()) {
- IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServerItem.getType());
+ if (mediaServer.isRtpEnable()) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
if (mediaNodeServerService == null) {
- logger.info("[openRTPServer] 澶辫触, mediaServerItem鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServerItem.getType());
+ logger.info("[openRTPServer] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
return null;
}
- rtpServerPort = mediaNodeServerService.createRTPServer(mediaServerItem, streamId, ssrcCheck ? Long.parseLong(ssrc) : 0, port, onlyAuto, reUsePort, tcpMode);
+ rtpServerPort = mediaNodeServerService.createRTPServer(mediaServer, streamId, ssrcCheck ? Long.parseLong(ssrc) : 0, port, onlyAuto, disableAudio, reUsePort, tcpMode);
} else {
- rtpServerPort = mediaServerItem.getRtpProxyPort();
+ rtpServerPort = mediaServer.getRtpProxyPort();
}
return new SSRCInfo(rtpServerPort, ssrc, streamId);
}
@Override
- public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String ssrc, boolean ssrcCheck, boolean isPlayback, Integer port, Boolean onlyAuto) {
- return openRTPServer(mediaServerItem, streamId, ssrc, ssrcCheck, isPlayback, port, onlyAuto, null, 0);
- }
-
-
- @Override
- public void closeRTPServer(MediaServerItem mediaServerItem, String streamId) {
- if (mediaServerItem == null) {
+ public void closeRTPServer(MediaServer mediaServer, String streamId) {
+ if (mediaServer == null) {
return;
}
- IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServerItem.getType());
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
if (mediaNodeServerService == null) {
- logger.info("[closeRTPServer] 澶辫触, mediaServerItem鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServerItem.getType());
+ logger.info("[closeRTPServer] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
return;
}
- mediaNodeServerService.closeRtpServer(mediaServerItem, streamId);
+ mediaNodeServerService.closeRtpServer(mediaServer, streamId);
}
@Override
- public void closeRTPServer(MediaServerItem mediaServerItem, String streamId, CommonCallback<Boolean> callback) {
- if (mediaServerItem == null) {
+ public void closeRTPServer(MediaServer mediaServer, String streamId, CommonCallback<Boolean> callback) {
+ if (mediaServer == null) {
callback.run(false);
return;
}
- IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServerItem.getType());
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
if (mediaNodeServerService == null) {
- logger.info("[closeRTPServer] 澶辫触, mediaServerItem鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServerItem.getType());
+ logger.info("[closeRTPServer] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
return;
}
- mediaNodeServerService.closeRtpServer(mediaServerItem, streamId, callback);
+ mediaNodeServerService.closeRtpServer(mediaServer, streamId, callback);
}
@Override
public void closeRTPServer(String mediaServerId, String streamId) {
- MediaServerItem mediaServerItem = this.getOne(mediaServerId);
- if (mediaServerItem == null) {
+ MediaServer mediaServer = this.getOne(mediaServerId);
+ if (mediaServer == null) {
return;
}
- if (mediaServerItem.isRtpEnable()) {
- closeRTPServer(mediaServerItem, streamId);
+ if (mediaServer.isRtpEnable()) {
+ closeRTPServer(mediaServer, streamId);
}
- IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServerItem.getType());
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
if (mediaNodeServerService == null) {
- logger.info("[closeRTPServer] 澶辫触, mediaServerItem鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServerItem.getType());
+ logger.info("[closeRTPServer] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
return;
}
- mediaNodeServerService.closeStreams(mediaServerItem, "rtp", streamId);
+ mediaNodeServerService.closeStreams(mediaServer, "rtp", streamId);
}
@Override
- public Boolean updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc) {
- if (mediaServerItem == null) {
+ public Boolean updateRtpServerSSRC(MediaServer mediaServer, String streamId, String ssrc) {
+ if (mediaServer == null) {
return false;
}
- IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServerItem.getType());
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
if (mediaNodeServerService == null) {
- logger.info("[updateRtpServerSSRC] 澶辫触, mediaServerItem鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServerItem.getType());
+ logger.info("[updateRtpServerSSRC] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
return false;
}
- return mediaNodeServerService.updateRtpServerSSRC(mediaServerItem, streamId, ssrc);
+ return mediaNodeServerService.updateRtpServerSSRC(mediaServer, streamId, ssrc);
}
@Override
- public void releaseSsrc(String mediaServerItemId, String ssrc) {
- MediaServerItem mediaServerItem = getOne(mediaServerItemId);
- if (mediaServerItem == null || ssrc == null) {
+ public void releaseSsrc(String mediaServerId, String ssrc) {
+ MediaServer mediaServer = getOne(mediaServerId);
+ if (mediaServer == null || ssrc == null) {
return;
}
- ssrcFactory.releaseSsrc(mediaServerItemId, ssrc);
+ ssrcFactory.releaseSsrc(mediaServerId, ssrc);
}
/**
* 濯掍綋鏈嶅姟鑺傜偣 閲嶅惎鍚庨噸缃粬鐨勬帹娴佷俊鎭紝 TODO 缁欐鍦ㄤ娇鐢ㄧ殑璁惧鍙戦�佸仠姝㈠懡浠�
*/
@Override
- public void clearRTPServer(MediaServerItem mediaServerItem) {
- ssrcFactory.reset(mediaServerItem.getId());
+ public void clearRTPServer(MediaServer mediaServer) {
+ ssrcFactory.reset(mediaServer.getId());
}
@Override
- public void update(MediaServerItem mediaSerItem) {
+ public void update(MediaServer mediaSerItem) {
mediaServerMapper.update(mediaSerItem);
- MediaServerItem mediaServerItemInRedis = getOne(mediaSerItem.getId());
- MediaServerItem mediaServerItemInDataBase = mediaServerMapper.queryOne(mediaSerItem.getId());
- if (mediaServerItemInRedis == null || !ssrcFactory.hasMediaServerSSRC(mediaSerItem.getId())) {
- ssrcFactory.initMediaServerSSRC(mediaServerItemInDataBase.getId(),null);
+ MediaServer mediaServerInRedis = getOne(mediaSerItem.getId());
+ MediaServer mediaServerInDataBase = mediaServerMapper.queryOne(mediaSerItem.getId());
+ if (mediaServerInDataBase == null) {
+ return;
}
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItemInDataBase.getId();
- redisTemplate.opsForValue().set(key, mediaServerItemInDataBase);
- if (mediaSerItem.isStatus()) {
- resetOnlineServerItem(mediaSerItem);
+ mediaServerInDataBase.setStatus(mediaSerItem.isStatus());
+ if (mediaServerInRedis == null || !ssrcFactory.hasMediaServerSSRC(mediaServerInDataBase.getId())) {
+ ssrcFactory.initMediaServerSSRC(mediaServerInDataBase.getId(),null);
+ }
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + ":" + mediaServerInDataBase.getId();
+ redisTemplate.opsForValue().set(key, mediaServerInDataBase);
+ if (mediaServerInDataBase.isStatus()) {
+ resetOnlineServerItem(mediaServerInDataBase);
+ }else {
+ // 鍙戦�佷簨浠�
+ MediaServerChangeEvent event = new MediaServerChangeEvent(this);
+ event.setMediaServerItemList(mediaServerInDataBase);
+ applicationEventPublisher.publishEvent(event);
}
}
+
@Override
- public List<MediaServerItem> getAll() {
- List<MediaServerItem> result = new ArrayList<>();
- List<Object> mediaServerKeys = RedisUtil.scan(redisTemplate, String.format("%S*", VideoManagerConstants.MEDIA_SERVER_PREFIX+ userSetting.getServerId() + "_" ));
- String onlineKey = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+ public List<MediaServer> getAllOnlineList() {
+ List<MediaServer> result = new ArrayList<>();
+ List<Object> mediaServerKeys = RedisUtil.scan(redisTemplate, String.format("%S*", VideoManagerConstants.MEDIA_SERVER_PREFIX+ userSetting.getServerId() + ":" ));
+ String onlineKey = VideoManagerConstants.ONLINE_MEDIA_SERVERS_PREFIX + userSetting.getServerId();
for (Object mediaServerKey : mediaServerKeys) {
String key = (String) mediaServerKey;
- MediaServerItem mediaServerItem = JsonUtil.redisJsonToObject(redisTemplate, key, MediaServerItem.class);
- if (Objects.isNull(mediaServerItem)) {
+ MediaServer mediaServer = JsonUtil.redisJsonToObject(redisTemplate, key, MediaServer.class);
+ if (Objects.isNull(mediaServer)) {
continue;
}
// 妫�鏌ョ姸鎬�
- Double aDouble = redisTemplate.opsForZSet().score(onlineKey, mediaServerItem.getId());
+ Double aDouble = redisTemplate.opsForZSet().score(onlineKey, mediaServer.getId());
if (aDouble != null) {
- mediaServerItem.setStatus(true);
+ mediaServer.setStatus(true);
}
- result.add(mediaServerItem);
+ result.add(mediaServer);
}
result.sort((serverItem1, serverItem2)->{
int sortResult = 0;
@@ -298,23 +315,38 @@
return result;
}
+ @Override
+ public List<MediaServer> getAll() {
+ List<MediaServer> mediaServerList = mediaServerMapper.queryAll();
+ if (mediaServerList.isEmpty()) {
+ return new ArrayList<>();
+ }
+ for (MediaServer mediaServer : mediaServerList) {
+ MediaServer mediaServerInRedis = getOne(mediaServer.getId());
+ if (mediaServerInRedis != null) {
+ mediaServer.setStatus(mediaServerInRedis.isStatus());
+ }
+ }
+ return mediaServerList;
+ }
+
@Override
- public List<MediaServerItem> getAllFromDatabase() {
+ public List<MediaServer> getAllFromDatabase() {
return mediaServerMapper.queryAll();
}
@Override
- public List<MediaServerItem> getAllOnline() {
- String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+ public List<MediaServer> getAllOnline() {
+ String key = VideoManagerConstants.ONLINE_MEDIA_SERVERS_PREFIX + userSetting.getServerId();
Set<Object> mediaServerIdSet = redisTemplate.opsForZSet().reverseRange(key, 0, -1);
- List<MediaServerItem> result = new ArrayList<>();
+ List<MediaServer> result = new ArrayList<>();
if (mediaServerIdSet != null && mediaServerIdSet.size() > 0) {
for (Object mediaServerId : mediaServerIdSet) {
String mediaServerIdStr = (String) mediaServerId;
- String serverKey = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerIdStr;
- result.add((MediaServerItem) redisTemplate.opsForValue().get(serverKey));
+ String serverKey = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + ":" + mediaServerIdStr;
+ result.add((MediaServer) redisTemplate.opsForValue().get(serverKey));
}
}
Collections.reverse(result);
@@ -324,179 +356,65 @@
/**
* 鑾峰彇鍗曚釜濯掍綋鏈嶅姟鑺傜偣鏈嶅姟鍣�
* @param mediaServerId 鏈嶅姟id
- * @return MediaServerItem
+ * @return mediaServer
*/
@Override
- public MediaServerItem getOne(String mediaServerId) {
+ public MediaServer getOne(String mediaServerId) {
if (mediaServerId == null) {
return null;
}
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerId;
- return JsonUtil.redisJsonToObject(redisTemplate, key, MediaServerItem.class);
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + ":" + mediaServerId;
+ return JsonUtil.redisJsonToObject(redisTemplate, key, MediaServer.class);
}
@Override
- public MediaServerItem getDefaultMediaServer() {
+ public MediaServer getDefaultMediaServer() {
return mediaServerMapper.queryDefault();
}
@Override
public void clearMediaServerForOnline() {
- String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+ String key = VideoManagerConstants.ONLINE_MEDIA_SERVERS_PREFIX + userSetting.getServerId();
redisTemplate.delete(key);
}
@Override
- public void add(MediaServerItem mediaServerItem) {
- mediaServerItem.setCreateTime(DateUtil.getNow());
- mediaServerItem.setUpdateTime(DateUtil.getNow());
- mediaServerItem.setHookAliveInterval(30f);
- if (mediaServerItem.getType() == null) {
- logger.info("[娣诲姞濯掍綋鑺傜偣] 澶辫触, mediaServerItem鐨勭被鍨嬶細涓虹┖");
+ public void add(MediaServer mediaServer) {
+ mediaServer.setCreateTime(DateUtil.getNow());
+ mediaServer.setUpdateTime(DateUtil.getNow());
+ if (mediaServer.getHookAliveInterval() == null || mediaServer.getHookAliveInterval() == 0F) {
+ mediaServer.setHookAliveInterval(10F);
+ }
+ if (mediaServer.getType() == null) {
+ logger.info("[娣诲姞濯掍綋鑺傜偣] 澶辫触, mediaServer鐨勭被鍨嬶細涓虹┖");
return;
}
- if (mediaServerMapper.queryOne(mediaServerItem.getId()) != null) {
- throw new ControllerException(ErrorCode.ERROR100.getCode(),"淇濆瓨澶辫触锛屽獟浣撴湇鍔D [ " + mediaServerItem.getId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
+ if (mediaServerMapper.queryOne(mediaServer.getId()) != null) {
+ logger.info("[娣诲姞濯掍綋鑺傜偣] 澶辫触, 濯掍綋鏈嶅姟ID宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆, {}", mediaServer.getId());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(),"淇濆瓨澶辫触锛屽獟浣撴湇鍔D [ " + mediaServer.getId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
}
- IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServerItem.getType());
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
if (mediaNodeServerService == null) {
- logger.info("[娣诲姞濯掍綋鑺傜偣] 澶辫触, mediaServerItem鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServerItem.getType());
+ logger.info("[娣诲姞濯掍綋鑺傜偣] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
return;
}
- if (mediaNodeServerService.checkNodeId(mediaServerItem)) {
- mediaServerMapper.add(mediaServerItem);
- mediaNodeServerService.online(mediaServerItem);
+
+ mediaServerMapper.add(mediaServer);
+ if (mediaServer.isStatus()) {
+ mediaNodeServerService.online(mediaServer);
}else {
- throw new ControllerException(ErrorCode.ERROR100.getCode(),"淇濆瓨澶辫触锛屽獟浣撴湇鍔D [ " + mediaServerItem.getId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
+ // 鍙戦�佷簨浠�
+ MediaServerChangeEvent event = new MediaServerChangeEvent(this);
+ event.setMediaServerItemList(mediaServer);
+ applicationEventPublisher.publishEvent(event);
}
}
@Override
- public int addToDatabase(MediaServerItem mediaSerItem) {
- return mediaServerMapper.add(mediaSerItem);
- }
-
- @Override
- public int updateToDatabase(MediaServerItem mediaSerItem) {
- int result = 0;
- if (mediaSerItem.isDefaultServer()) {
- TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
- int delResult = mediaServerMapper.delDefault();
- if (delResult == 0) {
- logger.error("绉婚櫎鏁版嵁搴撻粯璁ゅ獟浣撴湇鍔¤妭鐐硅妭鐐瑰け璐�");
- //浜嬪姟鍥炴粴
- dataSourceTransactionManager.rollback(transactionStatus);
- return 0;
- }
- result = mediaServerMapper.add(mediaSerItem);
- dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
- }else {
- result = mediaServerMapper.update(mediaSerItem);
- }
- return result;
- }
-
- /**
- * 澶勭悊濯掍綋鏈嶅姟鑺傜偣涓婄嚎
- * @param zlmServerConfig 濯掍綋鏈嶅姟鑺傜偣涓婄嚎鎼哄甫鐨勫弬鏁�
- */
- @Override
- public void zlmServerOnline(ZLMServerConfig zlmServerConfig) {
-
- MediaServerItem serverItem = mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId());
- if (serverItem == null) {
- logger.warn("[鏈敞鍐岀殑濯掍綋鏈嶅姟鑺傜偣] 鎷掓帴鎺ュ叆锛歿}鏉ヨ嚜{}锛歿}", zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
- logger.warn("璇锋鏌ュ獟浣撴湇鍔¤妭鐐圭殑ID閰嶇疆鏄惁涓嶹VP鐨�<media.id>涓�鑷�");
- return;
- }else {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣] 姝ｅ湪杩炴帴 : {} -> {}:{}",
- zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
- }
- serverItem.setHookAliveInterval(zlmServerConfig.getHookAliveInterval());
- if (serverItem.getHttpPort() == 0) {
- serverItem.setHttpPort(zlmServerConfig.getHttpPort());
- }
- if (serverItem.getHttpSSlPort() == 0) {
- serverItem.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
- }
- if (serverItem.getRtmpPort() == 0) {
- serverItem.setRtmpPort(zlmServerConfig.getRtmpPort());
- }
- if (serverItem.getRtmpSSlPort() == 0) {
- serverItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
- }
- if (serverItem.getRtspPort() == 0) {
- serverItem.setRtspPort(zlmServerConfig.getRtspPort());
- }
- if (serverItem.getRtspSSLPort() == 0) {
- serverItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
- }
- if (serverItem.getRtpProxyPort() == 0) {
- serverItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
- }
- serverItem.setStatus(true);
-
- if (ObjectUtils.isEmpty(serverItem.getId())) {
- logger.warn("[鏈敞鍐岀殑濯掍綋鏈嶅姟鑺傜偣] serverItem缂哄皯ID锛� 鏃犳硶鎺ュ叆锛歿}锛歿}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
- return;
- }
- mediaServerMapper.update(serverItem);
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + zlmServerConfig.getGeneralMediaServerId();
- if (!ssrcFactory.hasMediaServerSSRC(serverItem.getId())) {
- ssrcFactory.initMediaServerSSRC(zlmServerConfig.getGeneralMediaServerId(), null);
- }
- redisTemplate.opsForValue().set(key, serverItem);
- resetOnlineServerItem(serverItem);
-
-
- if (serverItem.isAutoConfig()) {
- setZLMConfig(serverItem, "0".equals(zlmServerConfig.getHookEnable()));
- }
- final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + serverItem.getId();
- dynamicTask.stop(zlmKeepaliveKey);
- dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(serverItem), (serverItem.getHookAliveInterval().intValue() + 5) * 1000);
- publisher.mediaServerOnlineEventPublish(serverItem.getId());
-
- logger.info("[濯掍綋鏈嶅姟鑺傜偣] 杩炴帴鎴愬姛 {} - {}:{} ",
- zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
- }
-
- class KeepAliveTimeoutRunnable implements Runnable{
-
- private MediaServerItem serverItem;
-
- public KeepAliveTimeoutRunnable(MediaServerItem serverItem) {
- this.serverItem = serverItem;
- }
-
- @Override
- public void run() {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣蹇冭烦鍒版湡]锛�" + serverItem.getId());
- // 鍙戣捣http璇锋眰楠岃瘉zlm鏄惁纭疄鏃犳硶杩炴帴锛屽鏋滅‘瀹炴棤娉曡繛鎺ュ垯鍙戦�佺绾夸簨浠讹紝鍚﹀垯涓嶄綔澶勭悊
- JSONObject mediaServerConfig = zlmresTfulUtils.getMediaServerConfig(serverItem);
- if (mediaServerConfig != null && mediaServerConfig.getInteger("code") == 0) {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣蹇冭烦鍒版湡]锛歿}楠岃瘉鍚庡獟浣撴湇鍔¤妭鐐逛粛鍦ㄧ嚎锛屾仮澶嶅績璺充俊鎭�,璇锋鏌ュ獟浣撴湇鍔¤妭鐐规槸鍚﹀彲浠ユ甯稿悜wvp鍙戦�佸績璺�", serverItem.getId());
- // 娣诲姞濯掍綋鏈嶅姟鑺傜偣淇℃伅
- updateMediaServerKeepalive(serverItem.getId(), null);
- }else {
- publisher.zlmOfflineEventPublish(serverItem.getId());
- }
- }
- }
-
-
- @Override
- public void zlmServerOffline(String mediaServerId) {
- delete(mediaServerId);
- final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + mediaServerId;
- dynamicTask.stop(zlmKeepaliveKey);
- }
-
- @Override
- public void resetOnlineServerItem(MediaServerItem serverItem) {
+ public void resetOnlineServerItem(MediaServer serverItem) {
// 鏇存柊缂撳瓨
- String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+ String key = VideoManagerConstants.ONLINE_MEDIA_SERVERS_PREFIX + userSetting.getServerId();
// 浣跨敤zset鐨勫垎鏁颁綔涓哄綋鍓嶅苟鍙戦噺锛� 榛樿鍊艰缃负0
if (redisTemplate.opsForZSet().score(key, serverItem.getId()) == null) { // 涓嶅瓨鍦ㄥ垯璁剧疆榛樿鍊� 宸插瓨鍦ㄥ垯閲嶇疆
redisTemplate.opsForZSet().add(key, serverItem.getId(), 0L);
@@ -508,7 +426,7 @@
}
}
- private int getMediaList(MediaServerItem serverItem) {
+ private int getMediaList(MediaServer serverItem) {
return 0;
}
@@ -519,24 +437,24 @@
if (mediaServerId == null) {
return;
}
- String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+ String key = VideoManagerConstants.ONLINE_MEDIA_SERVERS_PREFIX + userSetting.getServerId();
redisTemplate.opsForZSet().incrementScore(key, mediaServerId, 1);
}
@Override
public void removeCount(String mediaServerId) {
- String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+ String key = VideoManagerConstants.ONLINE_MEDIA_SERVERS_PREFIX + userSetting.getServerId();
redisTemplate.opsForZSet().incrementScore(key, mediaServerId, - 1);
}
/**
* 鑾峰彇璐熻浇鏈�浣庣殑鑺傜偣
- * @return MediaServerItem
+ * @return mediaServer
*/
@Override
- public MediaServerItem getMediaServerForMinimumLoad(Boolean hasAssist) {
- String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+ public MediaServer getMediaServerForMinimumLoad(Boolean hasAssist) {
+ String key = VideoManagerConstants.ONLINE_MEDIA_SERVERS_PREFIX + userSetting.getServerId();
Long size = redisTemplate.opsForZSet().zCard(key);
if (size == null || size == 0) {
logger.info("鑾峰彇璐熻浇鏈�浣庣殑鑺傜偣鏃舵棤鍦ㄧ嚎鑺傜偣");
@@ -546,139 +464,51 @@
// 鑾峰彇鍒嗘暟鏈�浣庣殑锛屽強骞跺彂鏈�浣庣殑
Set<Object> objects = redisTemplate.opsForZSet().range(key, 0, -1);
ArrayList<Object> mediaServerObjectS = new ArrayList<>(objects);
- MediaServerItem mediaServerItem = null;
+ MediaServer mediaServer = null;
if (hasAssist == null) {
String mediaServerId = (String)mediaServerObjectS.get(0);
- mediaServerItem = getOne(mediaServerId);
+ mediaServer = getOne(mediaServerId);
}else if (hasAssist) {
for (Object mediaServerObject : mediaServerObjectS) {
String mediaServerId = (String)mediaServerObject;
- MediaServerItem serverItem = getOne(mediaServerId);
+ MediaServer serverItem = getOne(mediaServerId);
if (serverItem.getRecordAssistPort() > 0) {
- mediaServerItem = serverItem;
+ mediaServer = serverItem;
break;
}
}
}else if (!hasAssist) {
for (Object mediaServerObject : mediaServerObjectS) {
String mediaServerId = (String)mediaServerObject;
- MediaServerItem serverItem = getOne(mediaServerId);
+ MediaServer serverItem = getOne(mediaServerId);
if (serverItem.getRecordAssistPort() == 0) {
- mediaServerItem = serverItem;
+ mediaServer = serverItem;
break;
}
}
}
- return mediaServerItem;
+ return mediaServer;
}
- /**
- * 瀵瑰獟浣撴湇鍔¤妭鐐规湇鍔″櫒杩涜鍩虹閰嶇疆
- * @param mediaServerItem 鏈嶅姟ID
- * @param restart 鏄惁閲嶅惎濯掍綋鏈嶅姟鑺傜偣
- */
@Override
- public void setZLMConfig(MediaServerItem mediaServerItem, boolean restart) {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣] 姝ｅ湪璁剧疆 锛歿} -> {}:{}",
- mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
- String protocol = sslEnabled ? "https" : "http";
- String hookPrefix = String.format("%s://%s:%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort);
-
- Map<String, Object> param = new HashMap<>();
- param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline
- if (mediaServerItem.getRtspPort() != 0) {
- param.put("ffmpeg.snap", "%s -rtsp_transport tcp -i %s -y -f mjpeg -frames:v 1 %s");
- }
- param.put("hook.enable","1");
- param.put("hook.on_flow_report","");
- param.put("hook.on_play",String.format("%s/on_play", hookPrefix));
- param.put("hook.on_http_access","");
- param.put("hook.on_publish", String.format("%s/on_publish", hookPrefix));
- param.put("hook.on_record_ts","");
- param.put("hook.on_rtsp_auth","");
- param.put("hook.on_rtsp_realm","");
- param.put("hook.on_server_started",String.format("%s/on_server_started", hookPrefix));
- param.put("hook.on_shell_login","");
- param.put("hook.on_stream_changed",String.format("%s/on_stream_changed", hookPrefix));
- param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrefix));
- param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrefix));
- param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrefix));
- param.put("hook.on_send_rtp_stopped",String.format("%s/on_send_rtp_stopped", hookPrefix));
- param.put("hook.on_rtp_server_timeout",String.format("%s/on_rtp_server_timeout", hookPrefix));
- param.put("hook.on_record_mp4",String.format("%s/on_record_mp4", hookPrefix));
- param.put("hook.timeoutSec","20");
- // 鎺ㄦ祦鏂紑鍚庡彲浠ュ湪瓒呮椂鏃堕棿鍐呴噸鏂拌繛鎺ヤ笂缁х画鎺ㄦ祦锛岃繖鏍锋挱鏀惧櫒浼氭帴鐫�鎾斁銆�
- // 缃�0鍏抽棴姝ょ壒鎬�(鎺ㄦ祦鏂紑浼氬鑷寸珛鍗虫柇寮�鎾斁鍣�)
- // 姝ゅ弬鏁颁笉搴斿ぇ浜庢挱鏀惧櫒瓒呮椂鏃堕棿
- // 浼樺寲姝ゆ秷鎭互鏇村揩鐨勬敹鍒版祦娉ㄩ攢浜嬩欢
- param.put("protocol.continue_push_ms", "3000" );
- // 鏈�澶氱瓑寰呮湭鍒濆鍖栫殑Track鏃堕棿锛屽崟浣嶆绉掞紝瓒呮椂涔嬪悗浼氬拷鐣ユ湭鍒濆鍖栫殑Track, 璁剧疆姝ら�夐」浼樺寲閭ｄ簺闊抽閿欒鐨勪笉瑙勮寖娴侊紝
- // 绛墇lm鏀寔缁欐瘡涓猺tpServer璁剧疆鍏抽棴闊抽鐨勬椂鍊欏彲浠ヤ笉璁剧疆姝ら�夐」
- if (mediaServerItem.isRtpEnable() && !ObjectUtils.isEmpty(mediaServerItem.getRtpPortRange())) {
- param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-"));
- }
-
- if (!ObjectUtils.isEmpty(mediaServerItem.getRecordPath())) {
- File recordPathFile = new File(mediaServerItem.getRecordPath());
- param.put("protocol.mp4_save_path", recordPathFile.getParentFile().getPath());
- param.put("protocol.downloadRoot", recordPathFile.getParentFile().getPath());
- param.put("record.appName", recordPathFile.getName());
- }
-
- JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param);
-
- if (responseJSON != null && responseJSON.getInteger("code") == 0) {
- if (restart) {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆鎴愬姛,寮�濮嬮噸鍚互淇濊瘉閰嶇疆鐢熸晥 {} -> {}:{}",
- mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
- zlmresTfulUtils.restartServer(mediaServerItem);
- }else {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆鎴愬姛 {} -> {}:{}",
- mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
- }
-
-
- }else {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆濯掍綋鏈嶅姟鑺傜偣澶辫触 {} -> {}:{}",
- mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
- }
-
-
- }
-
-
- @Override
- public MediaServerItem checkMediaServer(String ip, int port, String secret) {
+ public MediaServer checkMediaServer(String ip, int port, String secret, String type) {
if (mediaServerMapper.queryOneByHostAndPort(ip, port) != null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "姝よ繛鎺ュ凡瀛樺湪");
}
- MediaServerItem mediaServerItem = new MediaServerItem();
- mediaServerItem.setIp(ip);
- mediaServerItem.setHttpPort(port);
- mediaServerItem.setSecret(secret);
- JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
- if (responseJSON == null) {
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "杩炴帴澶辫触");
+
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(type);
+ if (mediaNodeServerService == null) {
+ logger.info("[closeRTPServer] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", type);
+ return null;
}
- JSONArray data = responseJSON.getJSONArray("data");
- ZLMServerConfig zlmServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
- if (zlmServerConfig == null) {
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "璇诲彇閰嶇疆澶辫触");
+ MediaServer mediaServer = mediaNodeServerService.checkMediaServer(ip, port, secret);
+ if (mediaServer != null) {
+ if (mediaServerMapper.queryOne(mediaServer.getId()) != null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "濯掍綋鏈嶅姟ID [" + mediaServer.getId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
+ }
}
- if (mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId()) != null) {
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "濯掍綋鏈嶅姟ID [" + zlmServerConfig.getGeneralMediaServerId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
- }
- mediaServerItem.setHttpSSlPort(zlmServerConfig.getHttpPort());
- mediaServerItem.setRtmpPort(zlmServerConfig.getRtmpPort());
- mediaServerItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
- mediaServerItem.setRtspPort(zlmServerConfig.getRtspPort());
- mediaServerItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
- mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
- mediaServerItem.setStreamIp(ip);
- mediaServerItem.setHookIp(sipConfig.getIp().split(",")[0]);
- mediaServerItem.setSdpIp(ip);
- return mediaServerItem;
+ return mediaServer;
}
@Override
@@ -702,74 +532,384 @@
@Override
public void delete(String id) {
- redisTemplate.opsForZSet().remove(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId(), id);
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + id;
- redisTemplate.delete(key);
- }
- @Override
- public void deleteDb(String id){
- //鍚屾鍒犻櫎鏁版嵁搴撲腑鐨勬暟鎹�
mediaServerMapper.delOne(id);
+ redisTemplate.opsForZSet().remove(VideoManagerConstants.ONLINE_MEDIA_SERVERS_PREFIX + userSetting.getServerId(), id);
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + ":" + id;
+ redisTemplate.delete(key);
+ // 鍙戦�佽妭鐐圭Щ闄ら�氱煡
+ MediaServerDeleteEvent event = new MediaServerDeleteEvent(this);
+ event.setMediaServerId(id);
+ applicationEventPublisher.publishEvent(event);
}
@Override
- public void updateMediaServerKeepalive(String mediaServerId, ServerKeepaliveData data) {
- MediaServerItem mediaServerItem = getOne(mediaServerId);
- if (mediaServerItem == null) {
- // 缂撳瓨涓嶅瓨鍦紝浠庢暟鎹簱鏌ヨ锛屽鏋滄暟鎹簱涓嶅瓨鍦ㄥ垯鏄敊璇殑
- mediaServerItem = getOneFromDatabase(mediaServerId);
- if (mediaServerItem == null) {
- logger.warn("[鏇存柊濯掍綋鏈嶅姟鑺傜偣 淇濇椿淇℃伅] 娴佸獟浣搟}灏氭湭鍔犲叆浣跨敤,璇锋鏌ヨ妭鐐逛腑鏄惁鍚湁姝ゆ祦濯掍綋 ", mediaServerId);
- return;
- }
- // 濯掍綋鏈嶅姟鑺傜偣杩炴帴閲嶈瘯
- logger.warn("[鏇存柊濯掍綋鏈嶅姟鑺傜偣 淇濇椿淇℃伅]灏濊瘯閾炬帴zml id {}", mediaServerId);
- ssrcFactory.initMediaServerSSRC(mediaServerItem.getId(), null);
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
- redisTemplate.opsForValue().set(key, mediaServerItem);
- resetOnlineServerItem(mediaServerItem);
- clearRTPServer(mediaServerItem);
- }
- final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + mediaServerItem.getId();
- dynamicTask.stop(zlmKeepaliveKey);
- dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(mediaServerItem), (mediaServerItem.getHookAliveInterval().intValue() + 5) * 1000);
- }
-
- private MediaServerItem getOneFromDatabase(String mediaServerId) {
+ public MediaServer getOneFromDatabase(String mediaServerId) {
return mediaServerMapper.queryOne(mediaServerId);
}
@Override
public void syncCatchFromDatabase() {
- List<MediaServerItem> allInCatch = getAll();
- List<MediaServerItem> allInDatabase = mediaServerMapper.queryAll();
- Map<String, MediaServerItem> mediaServerItemMap = new HashMap<>();
+ List<MediaServer> allInCatch = getAllOnlineList();
+ List<MediaServer> allInDatabase = mediaServerMapper.queryAll();
+ Map<String, MediaServer> mediaServerMap = new HashMap<>();
- for (MediaServerItem mediaServerItem : allInDatabase) {
- mediaServerItemMap.put(mediaServerItem.getId(), mediaServerItem);
+ for (MediaServer mediaServer : allInDatabase) {
+ mediaServerMap.put(mediaServer.getId(), mediaServer);
}
- for (MediaServerItem mediaServerItem : allInCatch) {
+ for (MediaServer mediaServer : allInCatch) {
// 娓呴櫎鏁版嵁涓笉瀛樺湪浣唕edis缂撳瓨鏁版嵁
- if (!mediaServerItemMap.containsKey(mediaServerItem.getId())) {
- delete(mediaServerItem.getId());
+ if (!mediaServerMap.containsKey(mediaServer.getId())) {
+ delete(mediaServer.getId());
}
}
}
@Override
- public MediaServerLoad getLoad(MediaServerItem mediaServerItem) {
+ public MediaServerLoad getLoad(MediaServer mediaServer) {
MediaServerLoad result = new MediaServerLoad();
- result.setId(mediaServerItem.getId());
- result.setPush(redisCatchStorage.getPushStreamCount(mediaServerItem.getId()));
- result.setProxy(redisCatchStorage.getProxyStreamCount(mediaServerItem.getId()));
+ result.setId(mediaServer.getId());
+ result.setPush(redisCatchStorage.getPushStreamCount(mediaServer.getId()));
+ result.setProxy(redisCatchStorage.getProxyStreamCount(mediaServer.getId()));
- result.setGbReceive(inviteStreamService.getStreamInfoCount(mediaServerItem.getId()));
- result.setGbSend(redisCatchStorage.getGbSendCount(mediaServerItem.getId()));
+ result.setGbReceive(inviteStreamService.getStreamInfoCount(mediaServer.getId()));
+ result.setGbSend(redisCatchStorage.getGbSendCount(mediaServer.getId()));
return result;
}
@Override
- public List<MediaServerItem> getAllWithAssistPort() {
+ public List<MediaServer> getAllWithAssistPort() {
return mediaServerMapper.queryAllWithAssistPort();
}
+
+
+ @Override
+ public boolean stopSendRtp(MediaServer mediaInfo, String app, String stream, String ssrc) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaInfo.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[stopSendRtp] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaInfo.getType());
+ return false;
+ }
+ return mediaNodeServerService.stopSendRtp(mediaInfo, app, stream, ssrc);
+ }
+
+ @Override
+ public boolean initStopSendRtp(MediaServer mediaInfo, String app, String stream, String ssrc) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaInfo.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[stopSendRtp] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaInfo.getType());
+ return false;
+ }
+ return mediaNodeServerService.initStopSendRtp(mediaInfo, app, stream, ssrc);
+ }
+
+ @Override
+ public boolean deleteRecordDirectory(MediaServer mediaServer, String app, String stream, String date, String fileName) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[stopSendRtp] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return false;
+ }
+ return mediaNodeServerService.deleteRecordDirectory(mediaServer, app, stream, date, fileName);
+ }
+
+ @Override
+ public List<StreamInfo> getMediaList(MediaServer mediaServer, String app, String stream, String callId) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[getMediaList] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return new ArrayList<>();
+ }
+ return mediaNodeServerService.getMediaList(mediaServer, app, stream, callId);
+ }
+
+ @Override
+ public Boolean connectRtpServer(MediaServer mediaServer, String address, int port, String stream) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[connectRtpServer] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return false;
+ }
+ return mediaNodeServerService.connectRtpServer(mediaServer, address, port, stream);
+ }
+
+ @Override
+ public void getSnap(MediaServer mediaServer, String streamUrl, int timeoutSec, int expireSec, String path, String fileName) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[getSnap] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return;
+ }
+ mediaNodeServerService.getSnap(mediaServer, streamUrl, timeoutSec, expireSec, path, fileName);
+ }
+
+ @Override
+ public MediaInfo getMediaInfo(MediaServer mediaServer, String app, String stream) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[getMediaInfo] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return null;
+ }
+ return mediaNodeServerService.getMediaInfo(mediaServer, app, stream);
+ }
+
+ @Override
+ public Boolean pauseRtpCheck(MediaServer mediaServer, String streamKey) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[pauseRtpCheck] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return false;
+ }
+ return mediaNodeServerService.pauseRtpCheck(mediaServer, streamKey);
+ }
+
+ @Override
+ public boolean resumeRtpCheck(MediaServer mediaServer, String streamKey) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[pauseRtpCheck] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return false;
+ }
+ return mediaNodeServerService.resumeRtpCheck(mediaServer, streamKey);
+ }
+
+ @Override
+ public String getFfmpegCmd(MediaServer mediaServer, String cmdKey) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[getFfmpegCmd] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return null;
+ }
+ return mediaNodeServerService.getFfmpegCmd(mediaServer, cmdKey);
+ }
+
+ @Override
+ public void closeStreams(MediaServer mediaServer, String app, String stream) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[closeStreams] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return;
+ }
+ mediaNodeServerService.closeStreams(mediaServer, app, stream);
+ }
+
+ @Override
+ public WVPResult<String> addFFmpegSource(MediaServer mediaServer, String srcUrl, String dstUrl, int timeoutMs, boolean enableAudio, boolean enableMp4, String ffmpegCmdKey) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[addFFmpegSource] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return WVPResult.fail(ErrorCode.ERROR400);
+ }
+ return mediaNodeServerService.addFFmpegSource(mediaServer, srcUrl, dstUrl, timeoutMs, enableAudio, enableMp4, ffmpegCmdKey);
+ }
+
+ @Override
+ public WVPResult<String> addStreamProxy(MediaServer mediaServer, String app, String stream, String url, boolean enableAudio, boolean enableMp4, String rtpType) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[addStreamProxy] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return WVPResult.fail(ErrorCode.ERROR400);
+ }
+ return mediaNodeServerService.addStreamProxy(mediaServer, app, stream, url, enableAudio, enableMp4, rtpType);
+ }
+
+ @Override
+ public Boolean delFFmpegSource(MediaServer mediaServer, String streamKey) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[delFFmpegSource] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return false;
+ }
+ return mediaNodeServerService.delFFmpegSource(mediaServer, streamKey);
+ }
+
+ @Override
+ public Boolean delStreamProxy(MediaServer mediaServerItem, String streamKey) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServerItem.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[delStreamProxy] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServerItem.getType());
+ return false;
+ }
+ return mediaNodeServerService.delStreamProxy(mediaServerItem, streamKey);
+ }
+
+ @Override
+ public Map<String, String> getFFmpegCMDs(MediaServer mediaServer) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[getFFmpegCMDs] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return new HashMap<>();
+ }
+ return mediaNodeServerService.getFFmpegCMDs(mediaServer);
+ }
+
+ @Override
+ public StreamInfo getStreamInfoByAppAndStream(MediaServer mediaServerItem, String app, String stream, MediaInfo mediaInfo, String callId) {
+ return getStreamInfoByAppAndStream(mediaServerItem, app, stream, mediaInfo, null, callId, true);
+ }
+
+ @Override
+ public StreamInfo getStreamInfoByAppAndStreamWithCheck(String app, String stream, String mediaServerId, String addr, boolean authority) {
+ StreamInfo streamInfo = null;
+ if (mediaServerId == null) {
+ mediaServerId = mediaConfig.getId();
+ }
+ MediaServer mediaInfo = getOne(mediaServerId);
+ if (mediaInfo == null) {
+ return null;
+ }
+ String calld = null;
+ StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(app, stream);
+ if (streamAuthorityInfo != null) {
+ calld = streamAuthorityInfo.getCallId();
+ }
+ List<StreamInfo> streamInfoList = getMediaList(mediaInfo, app, stream, calld);
+ if (streamInfoList.isEmpty()) {
+ return null;
+ }else {
+ return streamInfoList.get(0);
+ }
+ }
+
+
+
+ @Override
+ public StreamInfo getStreamInfoByAppAndStreamWithCheck(String app, String stream, String mediaServerId, boolean authority) {
+ return getStreamInfoByAppAndStreamWithCheck(app, stream, mediaServerId, null, authority);
+ }
+
+ @Override
+ public StreamInfo getStreamInfoByAppAndStream(MediaServer mediaServer, String app, String stream, MediaInfo mediaInfo, String addr, String callId, boolean isPlay) {
+ StreamInfo streamInfoResult = new StreamInfo();
+ streamInfoResult.setStream(stream);
+ streamInfoResult.setApp(app);
+ if (addr == null) {
+ addr = mediaServer.getStreamIp();
+ }
+
+ streamInfoResult.setIp(addr);
+ streamInfoResult.setMediaServerId(mediaServer.getId());
+ String callIdParam = ObjectUtils.isEmpty(callId)?"":"?callId=" + callId;
+ streamInfoResult.setRtmp(addr, mediaServer.getRtmpPort(),mediaServer.getRtmpSSlPort(), app, stream, callIdParam);
+ streamInfoResult.setRtsp(addr, mediaServer.getRtspPort(),mediaServer.getRtspSSLPort(), app, stream, callIdParam);
+
+
+ if ("abl".equals(mediaServer.getType())) {
+ String flvFile = String.format("%s/%s.flv%s", app, stream, callIdParam);
+ streamInfoResult.setFlv(addr, mediaServer.getFlvPort(),mediaServer.getFlvSSLPort(), flvFile);
+ streamInfoResult.setWsFlv(addr, mediaServer.getWsFlvPort(),mediaServer.getWsFlvSSLPort(), flvFile);
+ }else {
+ String flvFile = String.format("%s/%s.live.flv%s", app, stream, callIdParam);
+ streamInfoResult.setFlv(addr, mediaServer.getFlvPort(),mediaServer.getFlvSSLPort(), flvFile);
+ streamInfoResult.setWsFlv(addr, mediaServer.getWsFlvPort(),mediaServer.getWsFlvSSLPort(), flvFile);
+ }
+
+ streamInfoResult.setFmp4(addr, mediaServer.getHttpPort(),mediaServer.getHttpSSlPort(), app, stream, callIdParam);
+ streamInfoResult.setHls(addr, mediaServer.getHttpPort(),mediaServer.getHttpSSlPort(), app, stream, callIdParam);
+ streamInfoResult.setTs(addr, mediaServer.getHttpPort(),mediaServer.getHttpSSlPort(), app, stream, callIdParam);
+ streamInfoResult.setRtc(addr, mediaServer.getHttpPort(),mediaServer.getHttpSSlPort(), app, stream, callIdParam, isPlay);
+
+ streamInfoResult.setMediaInfo(mediaInfo);
+ return streamInfoResult;
+ }
+
+ @Override
+ public Boolean isStreamReady(MediaServer mediaServer, String rtp, String streamId) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[isStreamReady] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ return false;
+ }
+ MediaInfo mediaInfo = mediaNodeServerService.getMediaInfo(mediaServer, rtp, streamId);
+ return mediaInfo != null;
+ }
+
+ @Override
+ public void startSendRtpPassive(MediaServer mediaServer, SendRtpItem sendRtpItem, Integer timeout) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[startSendRtpPassive] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒癿ediaServer瀵瑰簲鐨勫疄鐜扮被");
+ }
+ mediaNodeServerService.startSendRtpPassive(mediaServer, sendRtpItem, timeout);
+ }
+
+ @Override
+ public void startSendRtp(MediaServer mediaServer, SendRtpItem sendRtpItem) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[startSendRtpStream] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒癿ediaServer瀵瑰簲鐨勫疄鐜扮被");
+ }
+ logger.info("[寮�濮嬫帹娴乚 rtp/{}, 鐩爣={}:{}锛孲SRC={}, RTCP={}", sendRtpItem.getStream(),
+ sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc(), sendRtpItem.isRtcp());
+ mediaNodeServerService.startSendRtpStream(mediaServer, sendRtpItem);
+ }
+
+ @Override
+ public SendRtpItem createSendRtpItem(MediaServer mediaServer, String ip, int port, String ssrc, String requesterId, String deviceId, String channelId, boolean isTcp, boolean rtcp) {
+ int localPort = sendRtpPortManager.getNextPort(mediaServer);
+ if (localPort == 0) {
+ return null;
+ }
+ SendRtpItem sendRtpItem = new SendRtpItem();
+ sendRtpItem.setIp(ip);
+ sendRtpItem.setPort(port);
+ sendRtpItem.setSsrc(ssrc);
+ sendRtpItem.setPlatformId(deviceId);
+ sendRtpItem.setDeviceId(deviceId);
+ sendRtpItem.setChannelId(channelId);
+ sendRtpItem.setTcp(isTcp);
+ sendRtpItem.setRtcp(rtcp);
+ sendRtpItem.setApp("rtp");
+ sendRtpItem.setLocalPort(localPort);
+ sendRtpItem.setServerId(userSetting.getServerId());
+ sendRtpItem.setMediaServerId(mediaServer.getId());
+ return sendRtpItem;
+ }
+
+ @Override
+ public SendRtpItem createSendRtpItem(MediaServer serverItem, String ip, int port, String ssrc, String platformId,
+ String app, String stream, String channelId, boolean tcp, boolean rtcp){
+
+ int localPort = sendRtpPortManager.getNextPort(serverItem);
+ if (localPort == 0) {
+ return null;
+ }
+ SendRtpItem sendRtpItem = new SendRtpItem();
+ sendRtpItem.setIp(ip);
+ sendRtpItem.setPort(port);
+ sendRtpItem.setSsrc(ssrc);
+ sendRtpItem.setApp(app);
+ sendRtpItem.setStream(stream);
+ sendRtpItem.setPlatformId(platformId);
+ sendRtpItem.setChannelId(channelId);
+ sendRtpItem.setTcp(tcp);
+ sendRtpItem.setLocalPort(localPort);
+ sendRtpItem.setServerId(userSetting.getServerId());
+ sendRtpItem.setMediaServerId(serverItem.getId());
+ sendRtpItem.setRtcp(rtcp);
+ return sendRtpItem;
+ }
+
+ @Override
+ public MediaServer getMediaServerByAppAndStream(String app, String stream) {
+ List<MediaServer> mediaServerList = getAll();
+ for (MediaServer mediaServer : mediaServerList) {
+ MediaInfo mediaInfo = getMediaInfo(mediaServer, app, stream);
+ if (mediaInfo != null) {
+ return mediaServer;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public Long updateDownloadProcess(MediaServer mediaServer, String app, String stream) {
+ IMediaNodeServerService mediaNodeServerService = nodeServerServiceMap.get(mediaServer.getType());
+ if (mediaNodeServerService == null) {
+ logger.info("[updateDownloadProcess] 澶辫触, mediaServer鐨勭被鍨嬶細 {}锛屾湭鎵惧埌瀵瑰簲鐨勫疄鐜扮被", mediaServer.getType());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒癿ediaServer瀵瑰簲鐨勫疄鐜扮被");
+ }
+ return mediaNodeServerService.updateDownloadProcess(mediaServer, app, stream);
+ }
}
--
Gitblit v1.8.0