From 361baa781b7bcdf68a0ed5e3a2262dfc077fdab4 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 9 Jun 2023 14:17:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/common/media/VideoUtils.java | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/com/jeesite/common/media/VideoUtils.java b/common/src/main/java/com/jeesite/common/media/VideoUtils.java index db24127f..6840f667 100644 --- a/common/src/main/java/com/jeesite/common/media/VideoUtils.java +++ b/common/src/main/java/com/jeesite/common/media/VideoUtils.java @@ -1,21 +1,19 @@ package com.jeesite.common.media; +import com.jeesite.common.image.ImageUtils; +import com.jeesite.common.io.FileUtils; +import com.jeesite.common.io.PropertiesUtils; +import com.jeesite.common.lang.StringUtils; +import com.jeesite.common.lang.TimeUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedReader; import java.io.File; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.jeesite.common.collect.ListUtils; -import com.jeesite.common.image.ImageUtils; -import com.jeesite.common.io.FileUtils; -import com.jeesite.common.io.PropertiesUtils; -import com.jeesite.common.lang.StringUtils; -import com.jeesite.common.lang.TimeUtils; - /** * 视频工具类 * @author ThinkGem @@ -170,7 +168,7 @@ public class VideoUtils { command.add(getFfmpegFile()); command.add("-i"); command.add(inputFile); - if ("gif".equals(imgFileExtension.toLowerCase())) { + if ("gif".equalsIgnoreCase(imgFileExtension)) { command.add("-vframes"); command.add("30"); command.add("-f"); @@ -281,7 +279,7 @@ public class VideoUtils { */ private boolean process(List command) { try { - log.debug(ListUtils.convertToString(command, " ")); + log.debug(StringUtils.join(command, " ")); // Process process = new ProcessBuilder(command).redirectErrorStream(true).start(); Process process = Runtime.getRuntime().exec(command.toArray(new String[command.size()])); new PrintErrorReader(process.getErrorStream()).start(); @@ -395,7 +393,7 @@ public class VideoUtils { this.height = height; } - class PrintInputStream extends Thread { + static class PrintInputStream extends Thread { java.io.InputStream __is = null; public PrintInputStream(java.io.InputStream is) { @@ -416,7 +414,7 @@ public class VideoUtils { } } - class PrintErrorReader extends Thread { + static class PrintErrorReader extends Thread { java.io.InputStream __is = null; public PrintErrorReader(java.io.InputStream is) {