From 2d2832dbe98967a661323dd0a3fdc1607106b983 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 22 二月 2023 18:01:30 +0800
Subject: [PATCH] 优化各个配置启动顺序
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 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 702f8a2..c93e449 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
@@ -22,6 +22,7 @@
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.MediaServerMapper;
import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.utils.JsonUtil;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import okhttp3.OkHttpClient;
@@ -168,8 +169,7 @@
if (mediaServerItem == null) {
return;
}
- zlmrtpServerFactory.closeRTPServer(mediaServerItem, streamId);
- releaseSsrc(mediaServerItem.getId(), streamId);
+ zlmrtpServerFactory.closeRtpServer(mediaServerItem, streamId);
}
@Override
@@ -229,7 +229,10 @@
String onlineKey = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
for (Object mediaServerKey : mediaServerKeys) {
String key = (String) mediaServerKey;
- MediaServerItem mediaServerItem = (MediaServerItem) RedisUtil.get(key);
+ MediaServerItem mediaServerItem = JsonUtil.redisJsonToObject(key, MediaServerItem.class);
+ if (Objects.isNull(mediaServerItem)) {
+ continue;
+ }
// 妫�鏌ョ姸鎬�
Double aDouble = RedisUtil.zScore(onlineKey, mediaServerItem.getId());
if (aDouble != null) {
@@ -281,7 +284,7 @@
return null;
}
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerId;
- return (MediaServerItem)RedisUtil.get(key);
+ return JsonUtil.redisJsonToObject(key, MediaServerItem.class);
}
@Override
@@ -397,8 +400,10 @@
SsrcConfig ssrcConfig = new SsrcConfig(zlmServerConfig.getGeneralMediaServerId(), null, sipConfig.getDomain());
serverItem.setSsrcConfig(ssrcConfig);
}else {
- MediaServerItem mediaServerItemInRedis = (MediaServerItem)RedisUtil.get(key);
- serverItem.setSsrcConfig(mediaServerItemInRedis.getSsrcConfig());
+ MediaServerItem mediaServerItemInRedis = JsonUtil.redisJsonToObject(key, MediaServerItem.class);
+ if (Objects.nonNull(mediaServerItemInRedis)) {
+ serverItem.setSsrcConfig(mediaServerItemInRedis.getSsrcConfig());
+ }
}
RedisUtil.set(key, serverItem);
resetOnlineServerItem(serverItem);
@@ -488,7 +493,7 @@
* @return MediaServerItem
*/
@Override
- public MediaServerItem getMediaServerForMinimumLoad() {
+ public MediaServerItem getMediaServerForMinimumLoad(Boolean hasAssist) {
String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
if (RedisUtil.zSize(key) == null || RedisUtil.zSize(key) == 0) {
@@ -501,9 +506,31 @@
// 鑾峰彇鍒嗘暟鏈�浣庣殑锛屽強骞跺彂鏈�浣庣殑
Set<Object> objects = RedisUtil.zRange(key, 0, -1);
ArrayList<Object> mediaServerObjectS = new ArrayList<>(objects);
+ MediaServerItem mediaServerItem = null;
+ if (hasAssist == null) {
+ String mediaServerId = (String)mediaServerObjectS.get(0);
+ mediaServerItem = getOne(mediaServerId);
+ }else if (hasAssist) {
+ for (Object mediaServerObject : mediaServerObjectS) {
+ String mediaServerId = (String)mediaServerObject;
+ MediaServerItem serverItem = getOne(mediaServerId);
+ if (serverItem.getRecordAssistPort() > 0) {
+ mediaServerItem = serverItem;
+ break;
+ }
+ }
+ }else if (!hasAssist) {
+ for (Object mediaServerObject : mediaServerObjectS) {
+ String mediaServerId = (String)mediaServerObject;
+ MediaServerItem serverItem = getOne(mediaServerId);
+ if (serverItem.getRecordAssistPort() == 0) {
+ mediaServerItem = serverItem;
+ break;
+ }
+ }
+ }
- String mediaServerId = (String)mediaServerObjectS.get(0);
- return getOne(mediaServerId);
+ return mediaServerItem;
}
/**
@@ -535,6 +562,7 @@
param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex));
param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrex));
param.put("hook.on_send_rtp_stopped",String.format("%s/on_send_rtp_stopped", hookPrex));
+ param.put("hook.on_rtp_server_timeout",String.format("%s/on_rtp_server_timeout", hookPrex));
if (mediaServerItem.getRecordAssistPort() > 0) {
param.put("hook.on_record_mp4",String.format("http://127.0.0.1:%s/api/record/on_record_mp4", mediaServerItem.getRecordAssistPort()));
}else {
@@ -545,8 +573,7 @@
// 缃�0鍏抽棴姝ょ壒鎬�(鎺ㄦ祦鏂紑浼氬鑷寸珛鍗虫柇寮�鎾斁鍣�)
// 姝ゅ弬鏁颁笉搴斿ぇ浜庢挱鏀惧櫒瓒呮椂鏃堕棿
// 浼樺寲姝ゆ秷鎭互鏇村揩鐨勬敹鍒版祦娉ㄩ攢浜嬩欢
- param.put("general.continue_push_ms", "3000" );
- param.put("general.publishToHls", "0" );
+ param.put("protocol.continue_push_ms", "3000" );
// 鏈�澶氱瓑寰呮湭鍒濆鍖栫殑Track鏃堕棿锛屽崟浣嶆绉掞紝瓒呮椂涔嬪悗浼氬拷鐣ユ湭鍒濆鍖栫殑Track, 璁剧疆姝ら�夐」浼樺寲閭ｄ簺闊抽閿欒鐨勪笉瑙勮寖娴侊紝
// 绛墇lm鏀寔缁欐瘡涓猺tpServer璁剧疆鍏抽棴闊抽鐨勬椂鍊欏彲浠ヤ笉璁剧疆姝ら�夐」
// param.put("general.wait_track_ready_ms", "3000" );
@@ -604,7 +631,7 @@
mediaServerItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
mediaServerItem.setStreamIp(ip);
- mediaServerItem.setHookIp(sipConfig.getIp());
+ mediaServerItem.setHookIp(sipConfig.getIp().split(",")[0]);
mediaServerItem.setSdpIp(ip);
return mediaServerItem;
}
--
Gitblit v1.8.0