From fd296d1a6acccbe9f3a72623719bf7101725f4e9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 06 五月 2021 09:28:22 +0800
Subject: [PATCH] Merge pull request #93 from yu1183688986/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 87 ++++++++++++++++++-------------------------
1 files changed, 37 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
index 0e6bfc0..2570c1b 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
@@ -3,7 +3,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.conf.MediaConfig;
+import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
//import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
@@ -34,35 +35,19 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
- @Value("${media.ip}")
- private String mediaIp;
+ @Autowired
+ private MediaConfig mediaConfig;
- @Value("${media.wanIp}")
- private String mediaWanIp;
-
- @Value("${media.hookIp}")
- private String mediaHookIp;
-
- @Value("${media.port}")
- private int mediaPort;
-
- @Value("${media.secret}")
- private String mediaSecret;
-
- @Value("${media.streamNoneReaderDelayMS}")
- private String streamNoneReaderDelayMS;
-
- @Value("${sip.ip}")
- private String sipIP;
+ @Autowired
+ private SipConfig sipConfig;
@Value("${server.port}")
private String serverPort;
- @Value("${media.autoConfig}")
- private boolean autoConfig;
-
@Value("${server.ssl.enabled}")
private boolean sslEnabled;
+
+ private boolean startGetMedia = false;
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
@@ -74,32 +59,37 @@
private ZLMHttpHookSubscribe hookSubscribe;
@Autowired
+ private ZLMServerManger zlmServerManger;
+
+ @Autowired
private IStreamProxyService streamProxyService;
@Override
public void run(String... strings) throws Exception {
// 璁㈤槄 zlm鍚姩浜嬩欢
hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_started,null,(response)->{
- MediaServerConfig mediaServerConfig = JSONObject.toJavaObject(response, MediaServerConfig.class);
- zLmRunning(mediaServerConfig);
+ ZLMServerConfig ZLMServerConfig = JSONObject.toJavaObject(response, ZLMServerConfig.class);
+ zLmRunning(ZLMServerConfig);
});
// 鑾峰彇zlm淇℃伅
logger.info("绛夊緟zlm鎺ュ叆...");
- MediaServerConfig mediaServerConfig = getMediaServerConfig();
+ startGetMedia = true;
+ ZLMServerConfig ZLMServerConfig = getMediaServerConfig();
- if (mediaServerConfig != null) {
- zLmRunning(mediaServerConfig);
+ if (ZLMServerConfig != null) {
+ zLmRunning(ZLMServerConfig);
}
}
- public MediaServerConfig getMediaServerConfig() {
+ public ZLMServerConfig getMediaServerConfig() {
+ if (!startGetMedia) return null;
JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig();
- MediaServerConfig mediaServerConfig = null;
+ ZLMServerConfig ZLMServerConfig = null;
if (responseJSON != null) {
JSONArray data = responseJSON.getJSONArray("data");
if (data != null && data.size() > 0) {
- mediaServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), MediaServerConfig.class);
+ ZLMServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
}
} else {
@@ -109,20 +99,18 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
- mediaServerConfig = getMediaServerConfig();
+ ZLMServerConfig = getMediaServerConfig();
}
- return mediaServerConfig;
+ return ZLMServerConfig;
}
private void saveZLMConfig() {
logger.info("璁剧疆zlm...");
- if (StringUtils.isEmpty(mediaHookIp)) {
- mediaHookIp = sipIP;
- }
+ if (StringUtils.isEmpty(mediaConfig.getHookIp())) mediaConfig.setHookIp(sipConfig.getSipIp());
String protocol = sslEnabled ? "https" : "http";
- String hookPrex = String.format("%s://%s:%s/index/hook", protocol, mediaHookIp, serverPort);
+ String hookPrex = String.format("%s://%s:%s/index/hook", protocol, mediaConfig.getHookIp(), serverPort);
Map<String, Object> param = new HashMap<>();
- param.put("api.secret",mediaSecret); // -profile:v Baseline
+ param.put("api.secret",mediaConfig.getSecret()); // -profile:v Baseline
param.put("ffmpeg.cmd","%s -fflags nobuffer -rtsp_transport tcp -i %s -c:a aac -strict -2 -ar 44100 -ab 48k -c:v libx264 -f flv %s");
param.put("hook.enable","1");
param.put("hook.on_flow_report","");
@@ -139,7 +127,7 @@
param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrex));
param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex));
param.put("hook.timeoutSec","20");
- param.put("general.streamNoneReaderDelayMS",streamNoneReaderDelayMS);
+ param.put("general.streamNoneReaderDelayMS",mediaConfig.getStreamNoneReaderDelayMS());
JSONObject responseJSON = zlmresTfulUtils.setServerConfig(param);
@@ -153,17 +141,16 @@
/**
* zlm 杩炴帴鎴愬姛鎴栬�厇lm閲嶅惎鍚�
*/
- private void zLmRunning(MediaServerConfig mediaServerConfig){
- logger.info( "[ id: " + mediaServerConfig.getGeneralMediaServerId() + "] zlm鎺ュ叆鎴愬姛...");
- if (autoConfig) saveZLMConfig();
- MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
- if (mediaInfo != null && System.currentTimeMillis() - mediaInfo.getUpdateTime() < 50){
- logger.info("[ id: " + mediaServerConfig.getGeneralMediaServerId() + "]zlm鍒氬垰鏇存柊锛屽拷鐣ヨ繖娆℃洿鏂�");
- return;
- }
- mediaServerConfig.setLocalIP(mediaIp);
- mediaServerConfig.setWanIp(StringUtils.isEmpty(mediaWanIp)? mediaIp: mediaWanIp);
- redisCatchStorage.updateMediaInfo(mediaServerConfig);
+ private void zLmRunning(ZLMServerConfig zlmServerConfig){
+ logger.info( "[ id: " + zlmServerConfig.getGeneralMediaServerId() + "] zlm鎺ュ叆鎴愬姛...");
+ // 鍏抽棴寰幆鑾峰彇zlm閰嶇疆
+ startGetMedia = false;
+ if (mediaConfig.getAutoConfig()) saveZLMConfig();
+ zlmServerManger.updateServerCatch(zlmServerConfig);
+
+ // 娓呯┖鎵�鏈塻ession
+// zlmMediaListManager.clearAllSessions();
+
// 鏇存柊娴佸垪琛�
zlmMediaListManager.updateMediaList();
// 鎭㈠娴佷唬鐞�
--
Gitblit v1.8.0