From 56859d09df8d4226882d43934acf32d60a3b51d7 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 30 三月 2021 18:46:34 +0800
Subject: [PATCH] 添加推流列表和拉流代理，下一步与国标关联
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 204 ++++++++++++++++++++++++++++----------------------
1 files changed, 113 insertions(+), 91 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 8dc8e50..15fa957 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.StreamProxyDto;
+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.vmanager.service.IStreamProxyService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,10 +16,11 @@
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
@Order(value=1)
@@ -24,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;
@@ -36,117 +49,126 @@
@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;
+
+ @Autowired
+ private ZLMRESTfulUtils zlmresTfulUtils;
+
+ @Autowired
+ private ZLMMediaListManager zlmMediaListManager;
+
+ @Autowired
+ private ZLMHttpHookSubscribe hookSubscribe;
+
+ @Autowired
+ private IStreamProxyService streamProxyService;
+
@Override
public void run(String... strings) throws Exception {
+ JSONObject subscribeKey = new JSONObject();
+ // 璁㈤槄 zlm鍚姩浜嬩欢
+ hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_started,subscribeKey,(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();
MediaServerConfig mediaServerConfig = null;
- OkHttpClient client = new OkHttpClient();
- String url = String.format("http://%s:%s/index/api/getServerConfig?secret=%s", mediaIp, mediaPort, mediaSecret);
- //鍒涘缓涓�涓猂equest
- Request request = new Request.Builder()
- .get()
- .url(url)
- .build();
- //閫氳繃client鍙戣捣璇锋眰
- final Call call = client.newCall(request);
- //鎵ц鍚屾璇锋眰锛岃幏鍙朢esponse瀵硅薄
- Response response = null;
- try {
- response = call.execute();
- if (response.isSuccessful()) {
- String responseStr = response.body().string();
- if (responseStr != null) {
- JSONObject responseJSON = JSON.parseObject(responseStr);
- 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鍚庨噸璇�");
- Thread.sleep(1000);
- getMediaServerConfig();
- }
- } catch (IOException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
+ if (responseJSON != null) {
+ JSONArray data = responseJSON.getJSONArray("data");
+ if (data != null && data.size() > 0) {
+ mediaServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), MediaServerConfig.class);
+ }
+ } else {
+ logger.error("getMediaServerConfig澶辫触, 1s鍚庨噸璇�");
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ 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;
}
- OkHttpClient client = new OkHttpClient();
- String url = String.format("http://%s:%s/index/api/setServerConfig", mediaIp, mediaPort);
- String hookPrex = String.format("http://%s:%s/index/hook", hookIP, serverPort);
- RequestBody body = new FormBody.Builder()
- .add("secret",mediaSecret)
- .add("hook.enable","1")
- .add("hook.on_flow_report","")
- .add("hook.on_http_access","")
- .add("hook.on_publish",String.format("%s/on_publish", hookPrex))
- .add("hook.on_record_mp4","")
- .add("hook.on_record_ts","")
- .add("hook.on_rtsp_auth","")
- .add("hook.on_rtsp_realm","")
- .add("hook.on_server_started",String.format("%s/on_server_started", hookPrex))
- .add("hook.on_shell_login",String.format("%s/on_shell_login", hookPrex))
- .add("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrex))
- .add("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex))
- .add("hook.timeoutSec","20")
- .build();
+ String hookPrex = String.format("http://%s:%s/index/hook", mediaHookIp, serverPort);
+ Map<String, Object> param = new HashMap<>();
+ 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","");
+ param.put("hook.on_http_access","");
+ param.put("hook.on_publish",String.format("%s/on_publish", hookPrex));
+ param.put("hook.on_record_mp4","");
+ 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", 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);
- Request request = new Request.Builder()
- .post(body)
- .url(url)
- .build();
- client.newCall(request).enqueue(new Callback() {
- @Override
- public void onFailure(Call call, IOException e) {
- logger.error("saveZLMConfig ",e);
- }
- @Override
- public void onResponse(Call call, Response response) throws IOException {
- if (response.isSuccessful()) {
- String responseStr = response.body().string();
- if (responseStr != null) {
- JSONObject responseJSON = JSON.parseObject(responseStr);
- if (responseJSON.getInteger("code") == 0) {
- logger.info("璁剧疆zlm鎴愬姛");
- }else {
- logger.info("璁剧疆zlm澶辫触: " + responseJSON.getString("msg"));
- }
- }
- }
+ JSONObject responseJSON = zlmresTfulUtils.setServerConfig(param);
- }
- });
+ if (responseJSON != null && responseJSON.getInteger("code") == 0) {
+ logger.info("璁剧疆zlm鎴愬姛");
+ }else {
+ logger.info("璁剧疆zlm澶辫触: " + responseJSON.getString("msg"));
+ }
+ }
+
+ /**
+ * zlm 杩炴帴鎴愬姛鎴栬�厇lm閲嶅惎鍚�
+ */
+ private void zLmRunning(MediaServerConfig mediaServerConfig){
+ logger.info("zlm鎺ュ叆鎴愬姛...");
+ if (autoConfig) saveZLMConfig();
+ MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
+ if (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<StreamProxyDto> streamProxyListForEnable = storager.getStreamProxyListForEnable(true);
+ for (StreamProxyDto streamProxyDto : streamProxyListForEnable) {
+ logger.info("鎭㈠娴佷唬鐞嗭紝" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
+ streamProxyService.addStreamProxyToZlm(streamProxyDto);
+ }
}
}
--
Gitblit v1.8.0