From 3ed3f6c299eabbda1c161408732d71ecb60b8959 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 24 十月 2023 16:34:39 +0800
Subject: [PATCH] 暂时取消异步登录 初始化清空流媒体重新加载
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
index 81be80e..b7242fd 100644
--- a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
@@ -1,8 +1,10 @@
package com.ruoyi.media.service.impl;
import com.alibaba.fastjson2.JSONObject;
+import com.dtflys.forest.Forest;
import com.dtflys.forest.exceptions.ForestNetworkException;
import com.dtflys.forest.exceptions.ForestRuntimeException;
+import com.dtflys.forest.http.ForestRequest;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.media.domain.*;
import com.ruoyi.media.service.IMediaService;
@@ -10,10 +12,14 @@
import com.ruoyi.utils.tools.ArdTool;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import javax.xml.soap.SOAPEnvelope;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -28,13 +34,22 @@
@Service
@Slf4j(topic = "vtdu")
@Order(2)
-public class MediaServiceImpl implements IMediaService {
-
+public class MediaServiceImpl implements IMediaService, ApplicationRunner {
+ private static List<String> mediaNameList = new ArrayList<>();
@Resource
MediaClient mediaClient;
@Value("${mediamtx.host}")
String mediamtxHost;
+ @Override
+ public void run(ApplicationArguments args) throws Exception {
+ mediaNameList = getNameList();
+ if(mediaNameList.size()>0)
+ {
+ removePath(mediaNameList.toArray(new String[0]));
+ mediaNameList.clear();
+ }
+ }
/**
* 娣诲姞娴佸獟浣�
@@ -55,13 +70,13 @@
String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;
Conf conf = new Conf();
- String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/mediamtx/";
+ String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/server/mediamtx/";
if (isCode.equals("1")) {
conf.setSource("publisher");
//榛樿杞В鐮�
String cmd = "ffmpeg -rtsp_transport tcp -i " + sourceUrl + " -vcodec libx264 -preset:v ultrafast -r 25 -keyint_min 25 -g 60 -sc_threshold 0 -threads 6 -b:v 2048k -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
if (mode.equals("0")) {//纭В鐮�
- cmd = "ffmpeg -hwaccel cuvid -c:v hevc_cuvid -rtsp_transport tcp -i " + sourceUrl + " -c:v h264_nvenc -r 25 -g 60 -sc_threshold 0 -threads 6 -b:v 2048k -bf 0 -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
+ cmd = rootPath+"ffmpeg -hwaccel cuvid -c:v hevc_cuvid -rtsp_transport tcp -i " + sourceUrl + " -c:v h264_nvenc -r 25 -g 60 -sc_threshold 0 -threads 6 -b:v 2048k -bf 0 -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
}
conf.setRunOnDemand(cmd);
conf.setRunOnDemandRestart(true);
@@ -74,14 +89,16 @@
conf.setSourceProtocol("tcp");
if (!checkNameExist(name)) {
- mediaClient.addPath(name, conf);
+ mediaClient.addPath(name, conf);
}
map.put("rtspUrl", rtspUrl);
map.put("rtmpUrl", rtmpUrl);
map.put("webrtcUrl", webrtcUrl);
+ } catch (ForestNetworkException ex) {
+ log.error("娣诲姞娴佸獟浣撳紓甯革細" + ex.getMessage());
} catch (ForestRuntimeException ex) {
- log.error("娣诲姞娴佸獟浣撳紓甯革細"+ex.getMessage());
+ log.error("娣诲姞娴佸獟浣撳紓甯革細" + ex.getMessage());
}
return map;
}
@@ -124,7 +141,7 @@
map.put("rtmpUrl", rtmpUrl);
map.put("webrtcUrl", webrtcUrl);
} catch (ForestRuntimeException ex) {
- log.error("淇敼娴佸獟浣撳紓甯革細"+ex.getMessage());
+ log.error("淇敼娴佸獟浣撳紓甯革細" + ex.getMessage());
}
return map;
}
@@ -157,6 +174,7 @@
for (String name : names) {
if (checkNameExist(name)) {
mediaClient.removePath(name);
+ log.info("鍒犻櫎鎴愬姛");
}
}
}
@@ -168,7 +186,7 @@
mediaClient.removePath(name);
}
} catch (ForestRuntimeException ex) {
- log.error("绉婚櫎娴佸獟浣撳紓甯革細"+ex.getMessage());
+ log.error("绉婚櫎娴佸獟浣撳紓甯革細" + ex.getMessage());
}
}
@@ -463,11 +481,10 @@
for (Items item : items) {
nameList.add(item.getName());
}
- }catch (ForestNetworkException ex) {
- log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�"+ex.getMessage());
- }
- catch (ForestRuntimeException ex) {
- log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�"+ex.getMessage());
+ } catch (ForestNetworkException ex) {
+ log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
+ } catch (ForestRuntimeException ex) {
+ log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
}
return nameList;
}
@@ -480,8 +497,7 @@
@Override
public boolean checkNameExist(String name) {
boolean result = false;
- List<String> nameList = getNameList();
- if (nameList.contains(name)) {
+ if (mediaNameList.contains(name)) {
result = true;
}
return result;
@@ -494,4 +510,6 @@
public String setConfig(Config config) {
return mediaClient.setConfig(config);
}
+
+
}
--
Gitblit v1.9.3