From cd37af890600186215fd53c0d419c89c562e3e70 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 23 九月 2023 16:02:06 +0800
Subject: [PATCH] 流媒体增加不转码自动按需拉流
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 41 ++---------------------------------------
1 files changed, 2 insertions(+), 39 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 71aa270..676071c 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
@@ -44,12 +44,8 @@
@Value("${mediamtx.host}")
String mediamtxHost;
- @Value("${mediamtx.enabled}")
- Boolean mediamtxEnabled;
@Value("${mediamtx.software_decoding}")
Boolean softwareDecoding;
-
- String processName = "mediamtx.exe";
@Override
public void run(ApplicationArguments args) {
@@ -70,41 +66,6 @@
}
} catch (Exception ex) {
log.error("鍔犺浇娴佸獟浣撳垪琛ㄥ紓甯�:" + ex.getMessage());
- }
- }
-
- @PostConstruct
- public void initMediaMtx() {
- if (mediamtxEnabled) {
- log.debug("鍒濆鍖栧惎鍔╩ediaMTX");
- if (Platform.isWindows()) {
- String exePath = System.getProperty("user.dir") + File.separator + "lib" + File.separator + "mediamtx" + File.separator + "mediamtx.exe";
- String ymlPath = System.getProperty("user.dir") + File.separator + "lib" + File.separator + "mediamtx" + File.separator + "mediamtx.yml";
-
- List<String> cmd = new ArrayList<>();
- cmd.add(exePath);
- cmd.add(ymlPath);
- if (CmdUtils.isProcessRunning(processName)) {
- // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋�
- CmdUtils.stopProcess(processName);
- }
- // 鍚姩鍚庡彴杩涚▼
- CmdUtils.commandStart(processName, cmd, null);
- // 鍚姩cmd绐楀彛
-// String[] command = {"cmd","/c","start",exePath,ymlPath};
-// CmdUtils.commandStart(command);
- }
- }
- }
-
- @PreDestroy
- public void destroyMediaMtx() {
- if (mediamtxEnabled) {
- log.info("閿�姣乵ediaMtx");
- if (CmdUtils.isProcessRunning(processName)) {
- // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋�
- CmdUtils.stopProcess(processName);
- }
}
}
@@ -145,6 +106,7 @@
}
} else {
mediaInfo.setSource(sourceUrl);
+ mediaInfo.setSourceondemand(true);
}
mediaInfo.setMaxReaders(100);
mediaInfo.setSourceprotocol("tcp");
@@ -198,6 +160,7 @@
}
} else {
mediaInfo.setSource(sourceUrl);
+ mediaInfo.setSourceondemand(true);
mediaInfo.setRunondemand("");
mediaInfo.setRunondemandrestart(false);
mediaInfo.setRunoninit("");
--
Gitblit v1.9.3