From a29a0a0785f966294ba01982fba62c1ff0f23bea Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 22 四月 2021 17:33:07 +0800
Subject: [PATCH] 增加对设备的兼容性
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 103 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 83 insertions(+), 20 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 8114814..308fa6b 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
@@ -4,8 +4,11 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+//import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import okhttp3.*;
+import com.genersoft.iot.vmp.service.IStreamProxyService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,11 +16,10 @@
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Component
@@ -26,11 +28,20 @@
private final static Logger logger = LoggerFactory.getLogger(ZLMRunner.class);
+ @Autowired
+ private IVideoManagerStorager storager;
+
@Autowired
- private IVideoManagerStorager storager;
+ private IRedisCatchStorage redisCatchStorage;
@Value("${media.ip}")
private String mediaIp;
+
+ @Value("${media.wanIp}")
+ private String mediaWanIp;
+
+ @Value("${media.hookIp}")
+ private String mediaHookIp;
@Value("${media.port}")
private int mediaPort;
@@ -38,30 +49,49 @@
@Value("${media.secret}")
private String mediaSecret;
+ @Value("${media.streamNoneReaderDelayMS}")
+ private String streamNoneReaderDelayMS;
+
@Value("${sip.ip}")
private String sipIP;
@Value("${server.port}")
private String serverPort;
+ @Value("${media.autoConfig}")
+ private boolean autoConfig;
+
+ @Value("${server.ssl.enabled}")
+ private boolean sslEnabled;
+
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
+ @Autowired
+ private ZLMMediaListManager zlmMediaListManager;
+
+ @Autowired
+ private ZLMHttpHookSubscribe hookSubscribe;
+
+ @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);
+ });
+
// 鑾峰彇zlm淇℃伅
logger.info("绛夊緟zlm鎺ュ叆...");
MediaServerConfig mediaServerConfig = getMediaServerConfig();
- if (mediaServerConfig != null) {
- logger.info("zlm鎺ュ叆鎴愬姛...");
- storager.updateMediaInfo(mediaServerConfig);
- logger.info("璁剧疆zlm...");
- saveZLMConfig();
+ if (mediaServerConfig != null) {
+ zLmRunning(mediaServerConfig);
}
}
-
-
public MediaServerConfig getMediaServerConfig() {
JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig();
@@ -70,7 +100,7 @@
JSONArray data = responseJSON.getJSONArray("data");
if (data != null && data.size() > 0) {
mediaServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), MediaServerConfig.class);
- mediaServerConfig.setLocalIP(mediaIp);
+
}
} else {
logger.error("getMediaServerConfig澶辫触, 1s鍚庨噸璇�");
@@ -79,22 +109,24 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
- getMediaServerConfig();
+ mediaServerConfig = getMediaServerConfig();
}
return mediaServerConfig;
}
private void saveZLMConfig() {
- String hookIP = sipIP;
- if (mediaIp.equals(sipIP)) {
- hookIP = "127.0.0.1";
+ logger.info("璁剧疆zlm...");
+ if (StringUtils.isEmpty(mediaHookIp)) {
+ mediaHookIp = sipIP;
}
-
- String hookPrex = String.format("http://%s:%s/index/hook", hookIP, serverPort);
+ String protocol = sslEnabled ? "https" : "http";
+ String hookPrex = String.format("%s://%s:%s/index/hook", protocol, mediaHookIp, serverPort);
Map<String, Object> param = new HashMap<>();
- param.put("secret",mediaSecret);
+ param.put("api.secret",mediaSecret); // -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","");
+ param.put("hook.on_play",String.format("%s/on_play", hookPrex));
param.put("hook.on_http_access","");
param.put("hook.on_publish",String.format("%s/on_publish", hookPrex));
param.put("hook.on_record_mp4","");
@@ -103,9 +135,11 @@
param.put("hook.on_rtsp_realm","");
param.put("hook.on_server_started",String.format("%s/on_server_started", hookPrex));
param.put("hook.on_shell_login",String.format("%s/on_shell_login", hookPrex));
+ param.put("hook.on_stream_changed",String.format("%s/on_stream_changed", hookPrex));
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);
JSONObject responseJSON = zlmresTfulUtils.setServerConfig(param);
@@ -115,4 +149,33 @@
logger.info("璁剧疆zlm澶辫触: " + responseJSON.getString("msg"));
}
}
+
+ /**
+ * zlm 杩炴帴鎴愬姛鎴栬�厇lm閲嶅惎鍚�
+ */
+ private void zLmRunning(MediaServerConfig mediaServerConfig){
+ logger.info("zlm鎺ュ叆鎴愬姛...");
+ if (autoConfig) saveZLMConfig();
+ MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
+ if (mediaInfo != null && System.currentTimeMillis() - mediaInfo.getUpdateTime() < 50){
+ logger.info("zlm鍒氬垰鏇存柊锛屽拷鐣ヨ繖娆℃洿鏂�");
+ return;
+ }
+ mediaServerConfig.setLocalIP(mediaIp);
+ mediaServerConfig.setWanIp(StringUtils.isEmpty(mediaWanIp)? mediaIp: mediaWanIp);
+ redisCatchStorage.updateMediaInfo(mediaServerConfig);
+ // 鏇存柊娴佸垪琛�
+ zlmMediaListManager.updateMediaList();
+ // 鎭㈠娴佷唬鐞�
+ List<StreamProxyItem> streamProxyListForEnable = storager.getStreamProxyListForEnable(true);
+ for (StreamProxyItem streamProxyDto : streamProxyListForEnable) {
+ logger.info("鎭㈠娴佷唬鐞嗭紝" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
+ JSONObject jsonObject = streamProxyService.addStreamProxyToZlm(streamProxyDto);
+ if (jsonObject == null) {
+ // 璁剧疆涓烘湭鍚敤
+ logger.info("鎭㈠娴佷唬鐞嗗け璐ワ紝璇锋鏌ユ祦鍦板潃鍚庨噸鏂板惎鐢�" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
+ streamProxyService.stop(streamProxyDto.getApp(), streamProxyDto.getStream());
+ }
+ }
+ }
}
--
Gitblit v1.8.0