From 62f4e8408b20b053d01c434a7f1a572b22048997 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 20 Nov 2025 14:58:22 +0800
Subject: [PATCH] 优化
---
ard-work/pom.xml | 6 -
ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java | 175 +++++++++++++++++++++++++++++--------------
ard-work/src/main/java/com/ard/work/util/osSelect.java | 39 +++++++++
3 files changed, 158 insertions(+), 62 deletions(-)
diff --git a/ard-work/pom.xml b/ard-work/pom.xml
index 8424eb8..ef3f0a4 100644
--- a/ard-work/pom.xml
+++ b/ard-work/pom.xml
@@ -113,12 +113,6 @@
<groupId>com.ard</groupId>
<artifactId>ard-oss</artifactId>
</dependency>
- <!-- JavaCV -->
- <dependency>
- <groupId>org.bytedeco</groupId>
- <artifactId>javacv-platform</artifactId>
- <version>1.5.8</version>
- </dependency>
</dependencies>
<repositories>
<repository>
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java
index 31fccef..cb0a57b 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java
@@ -16,28 +16,26 @@
import com.ard.work.mapper.ArdMediaMapper;
import com.ard.work.service.IArdFlightTaskService;
import com.ard.work.service.IArdServerInfoService;
+import com.ard.work.util.osSelect;
import lombok.extern.slf4j.Slf4j;
-import org.bytedeco.javacv.FFmpegFrameGrabber;
-import org.bytedeco.javacv.Frame;
-import org.bytedeco.javacv.Java2DFrameConverter;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import javax.imageio.ImageIO;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
-import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
import java.security.cert.X509Certificate;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -175,7 +173,7 @@
}
String boxSn = flightTask.getBoxSn();
for (String videoPath : videoPathList) {
-
+ //videoPath = "https://192.168.1.3:9001/record/DBM250974065008/8212fd8e89814d66b6c32f48d05f5101.mp4";
ArdMedia media = ArdMedia.builder()
.id(IdUtils.simpleUUID())
.taskId(flightTask.getTaskId())
@@ -185,6 +183,7 @@
.build();
// ---- 1. 视频上传（失败不抛异常，返回 null） ----
+
CompletableFuture<String> videoFuture = CompletableFuture.supplyAsync(() -> {
try (InputStream inputStream = openUrlInputStream(videoPath, 5000, 10000)) {
if (inputStream != null) {
@@ -201,9 +200,10 @@
return null;
}, threadPoolTaskExecutor);
// ---- 2. 缩略图上传（失败不抛异常，返回 null） ----
+
CompletableFuture<String> thumbFuture = CompletableFuture.supplyAsync(() -> {
try {
- try (ByteArrayInputStream thumbStream = generateThumbnail(videoPath, 2, 200)) {
+ try (ByteArrayInputStream thumbStream = generateThumbnail(videoPath, 1, 200)) {
if (thumbStream != null) {
return ossServiceContext.upload(
"record",
@@ -278,7 +278,7 @@
// ---- 2. 缩略图上传（失败不抛异常，返回 null） ----
CompletableFuture<String> thumbFuture = CompletableFuture.supplyAsync(() -> {
try {
- try (ByteArrayInputStream thumbStream = generateThumbnail(videoPath, 2, 200)) {
+ try (ByteArrayInputStream thumbStream = generateThumbnail(videoPath, 1, 200)) {
if (thumbStream != null) {
return ossServiceContext.upload(
"record",
@@ -415,66 +415,129 @@
}
// 生成视频缩略图
- public ByteArrayInputStream generateThumbnail(String videoFile, int skipFrames, int targetWidth) {
- long start = System.currentTimeMillis();
- FFmpegFrameGrabber grabber = null;
+ public ByteArrayInputStream generateThumbnail1(String videoFile, int skipFrames, int targetWidth) {
+// long start = System.currentTimeMillis();
+// FFmpegFrameGrabber grabber = null;
+//
+// try {
+// grabber = new FFmpegFrameGrabber(videoFile);
+// grabber.start();
+//
+// int totalFrames = grabber.getLengthInFrames();
+// System.out.println("视频总帧数: " + totalFrames);
+// System.out.println("视频时长: " + grabber.getLengthInTime() / 1000000 + "秒");
+//
+// Frame frame = null;
+// int currentFrame = 0;
+//
+// // 读取指定帧数后的第一帧有效图像
+// while (currentFrame < totalFrames) {
+// frame = grabber.grabImage();
+// if (frame == null) {
+// break;
+// }
+//
+// if (currentFrame > skipFrames && frame.image != null) {
+// break;
+// }
+// currentFrame++;
+// }
+//
+// if (frame == null || frame.image == null) {
+// throw new Exception("无法获取有效视频帧");
+// }
+//
+// // 转换 Frame 为 BufferedImage
+// Java2DFrameConverter converter = new Java2DFrameConverter();
+// BufferedImage image = converter.getBufferedImage(frame);
+//
+// // 按目标宽度等比缩放
+// int targetHeight = (int) ((double) targetWidth / image.getWidth() * image.getHeight());
+// BufferedImage scaledImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_3BYTE_BGR);
+// scaledImage.getGraphics().drawImage(image, 0, 0, targetWidth, targetHeight, null);
+//
+// // 转成 ByteArrayInputStream
+// ByteArrayOutputStream baos = new ByteArrayOutputStream();
+// ImageIO.write(scaledImage, "jpg", baos);
+// long cost = System.currentTimeMillis() - start;
+// System.out.println("处理耗时: " + cost + "ms");
+//
+// return new ByteArrayInputStream(baos.toByteArray());
+//
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// } finally {
+// if (grabber != null) {
+// try {
+// grabber.stop();
+// grabber.close();
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+// }
+ return null;
+ }
+ public ByteArrayInputStream generateThumbnail(
+ String videoFile,
+ int skipSeconds,
+ int targetWidth) {
+ String ffmpegPath = "";
+ if (osSelect.isWindows()) {
+ ffmpegPath = "ffmpeg";
+ } else if (osSelect.isLinux()) {
+ ffmpegPath = "/usr/local/ffmpeg/bin/ffmpeg";
+ }
try {
- grabber = new FFmpegFrameGrabber(videoFile);
- grabber.start();
+ List<String> command = new ArrayList<>();
+ command.add(ffmpegPath);
+ command.add("-ss");
+ command.add(String.format("00:00:%02d", skipSeconds));
+ command.add("-i");
+ command.add(videoFile);
+ command.add("-vframes");
+ command.add("1");
- int totalFrames = grabber.getLengthInFrames();
- System.out.println("视频总帧数: " + totalFrames);
- System.out.println("视频时长: " + grabber.getLengthInTime() / 1000000 + "秒");
+ // 等比缩放
+ command.add("-vf");
+ command.add("scale=" + targetWidth + ":-1");
- Frame frame = null;
- int currentFrame = 0;
+ // **确保输出 JPEG**
+ command.add("-f");
+ command.add("mjpeg"); // 关键点：输出格式固定为 JPEG
+ command.add("-vcodec");
+ command.add("mjpeg");
- // 读取指定帧数后的第一帧有效图像
- while (currentFrame < totalFrames) {
- frame = grabber.grabImage();
- if (frame == null) {
- break;
- }
+ // 输出到管道
+ command.add("pipe:1");
- if (currentFrame > skipFrames && frame.image != null) {
- break;
- }
- currentFrame++;
- }
+ // ⭐ 打印最终命令（可复制）
+ log.info("ffmpeg command: {}", String.join(" ", command));
- if (frame == null || frame.image == null) {
- throw new Exception("无法获取有效视频帧");
- }
+ ProcessBuilder pb = new ProcessBuilder(command);
+ pb.redirectErrorStream(false);
+ Process process = pb.start();
- // 转换 Frame 为 BufferedImage
- Java2DFrameConverter converter = new Java2DFrameConverter();
- BufferedImage image = converter.getBufferedImage(frame);
-
- // 按目标宽度等比缩放
- int targetHeight = (int) ((double) targetWidth / image.getWidth() * image.getHeight());
- BufferedImage scaledImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_3BYTE_BGR);
- scaledImage.getGraphics().drawImage(image, 0, 0, targetWidth, targetHeight, null);
-
- // 转成 ByteArrayInputStream
+ // 读取 FFmpeg 输出（JPEG 数据）到内存
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ImageIO.write(scaledImage, "jpg", baos);
- long cost = System.currentTimeMillis() - start;
- System.out.println("处理耗时: " + cost + "ms");
+ try (InputStream is = process.getInputStream()) {
+ byte[] buffer = new byte[8192];
+ int len;
+ while ((len = is.read(buffer)) != -1) {
+ baos.write(buffer, 0, len);
+ }
+ }
+
+ int exitCode = process.waitFor();
+ if (exitCode != 0) {
+ throw new RuntimeException("FFmpeg 执行失败，退出码: " + exitCode);
+ }
return new ByteArrayInputStream(baos.toByteArray());
- } catch (Exception e) {
- throw new RuntimeException(e);
- } finally {
- if (grabber != null) {
- try {
- grabber.stop();
- grabber.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
+ } catch (IOException | InterruptedException e) {
+ throw new RuntimeException("FFmpeg 生成缩略图失败", e);
}
}
diff --git a/ard-work/src/main/java/com/ard/work/util/osSelect.java b/ard-work/src/main/java/com/ard/work/util/osSelect.java
new file mode 100644
index 0000000..da5f288
--- /dev/null
+++ b/ard-work/src/main/java/com/ard/work/util/osSelect.java
@@ -0,0 +1,39 @@
+package com.ard.work.util;
+
+/**
+ * 操作系统和架构判断工具类
+ * @author jiangxin
+ */
+public class osSelect {
+
+ private static final String OS_NAME = System.getProperty("os.name").toLowerCase();
+ private static final String OS_ARCH = System.getProperty("os.arch").toLowerCase(); // 例如：x86_64 / amd64 / aarch64
+
+ public static boolean isLinux() {
+ return OS_NAME.contains("linux");
+ }
+
+ public static boolean isWindows() {
+ return OS_NAME.contains("windows");
+ }
+
+ public static boolean isMac() {
+ return OS_NAME.contains("mac");
+ }
+
+ public static boolean isArm64() {
+ return OS_ARCH.contains("aarch64") || OS_ARCH.contains("arm64");
+ }
+
+ public static boolean isX64() {
+ return OS_ARCH.contains("x86_64") || OS_ARCH.contains("amd64");
+ }
+
+ public static String getArch() {
+ return OS_ARCH;
+ }
+
+ public static String getOsName() {
+ return OS_NAME;
+ }
+}
--
Gitblit v1.9.3