eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix gif looping args, parse frame progress properly

Browse Source
This commit is contained in:
Ben Fry
2021-06-27 13:50:17 -04:00
parent e6f1755232
commit 2d95f6b209
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/shared/tools/MovieMaker/src/processing/app/tools/FFmpegEngine.java
+13 -4
View File
@@ -14,7 +14,8 @@ import java.util.regex.Pattern;
class FFmpegEngine {
Pattern framePattern = Pattern.compile("\\sframe=(\\d+)\\s");
//Pattern framePattern = Pattern.compile("\\sframe=(\\d+)\\s");
Pattern framePattern = Pattern.compile("^frame=(\\d+)$");
Component parent;
String ffmpegPath;
@@ -149,8 +150,10 @@ class FFmpegEngine {
cmd.add("-vf");
cmd.add(formatArgs);
// https://www.ffmpeg.org/ffmpeg-formats.html#gif-2
cmd.add("-loop");
cmd.add(formatName.contains("loop") ? "1" : "0");
// -1 means no loop, 0 means infinite loop (1+ means number of loops?)
cmd.add(formatName.contains("loop") ? "0" : "-1");
if (!outputPath.toLowerCase().endsWith(".gif")) {
outputPath += ".gif";
@@ -180,8 +183,10 @@ class FFmpegEngine {
int frameCount = Integer.parseInt(m.group(1));
// this was used to show which (input) image file was being handled
//progress.setNote(Language.interpolate("movie_maker.progress.processing", inputName));
System.out.println(frameCount + " of " + imgFiles.length);
// System.out.println(frameCount + " of " + imgFiles.length);
progress.setProgress(frameCount);
// } else {
// System.out.println(">>>" + line + "<<<");
}
});
@@ -189,7 +194,11 @@ class FFmpegEngine {
new Thread(errorGobbler).start();
try {
int result = p.waitFor();
System.out.println(result);
//System.out.println("encoding result was " + result);
if (result != 0) {
throw new IOException("Unknown error while creating movie. " +
"(FFmpeg result was " + result + ")");
}
progress.close();
} catch (InterruptedException ignored) { }