From e91c6cc85773020dd6db3994744e2bf8e4f3fcd8 Mon Sep 17 00:00:00 2001 From: stonio Date: Thu, 23 Jun 2016 16:27:45 +0200 Subject: [PATCH 1/7] FractionAdapter - polish --- .../net/bramp/commons/lang3/math/gson/FractionAdapter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/bramp/commons/lang3/math/gson/FractionAdapter.java b/src/main/java/net/bramp/commons/lang3/math/gson/FractionAdapter.java index 34c885ac..acdce8cc 100644 --- a/src/main/java/net/bramp/commons/lang3/math/gson/FractionAdapter.java +++ b/src/main/java/net/bramp/commons/lang3/math/gson/FractionAdapter.java @@ -50,12 +50,14 @@ public Fraction read(JsonReader reader) throws IOException { String fraction = reader.nextString().trim(); // Ambiguous as to what 0/0 is, but FFmpeg seems to think it's zero - if (zeroByZero != null && fraction.equals("0/0")) + if (zeroByZero != null && "0/0".equals(fraction)) { return zeroByZero; + } // Another edge cases is invalid files sometimes output 1/0. - if (divideByZero != null && fraction.endsWith("/0")) + if (divideByZero != null && fraction.endsWith("/0")) { return divideByZero; + } return Fraction.getFraction(fraction); } From 1de55cbed27d9a4d62e5f23ada17790ac0a0bd77 Mon Sep 17 00:00:00 2001 From: stonio Date: Thu, 23 Jun 2016 16:40:27 +0200 Subject: [PATCH 2/7] FFmpegBuilder - polish --- .../bramp/ffmpeg/builder/FFmpegBuilder.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/bramp/ffmpeg/builder/FFmpegBuilder.java b/src/main/java/net/bramp/ffmpeg/builder/FFmpegBuilder.java index 9cf64baf..57e9b81c 100644 --- a/src/main/java/net/bramp/ffmpeg/builder/FFmpegBuilder.java +++ b/src/main/java/net/bramp/ffmpeg/builder/FFmpegBuilder.java @@ -27,24 +27,26 @@ public class FFmpegBuilder { final static Logger LOG = LoggerFactory.getLogger(FFmpegBuilder.class); public enum Strict { - VERY, // strictly conform to a older more strict version of the spec or reference software - STRICT, // strictly conform to all the things in the spec no matter what consequences + VERY, // strictly conform to a older more strict version of the specifications or reference software + STRICT, // strictly conform to all the things in the specificiations no matter what consequences NORMAL, // normal UNOFFICAL, // allow unofficial extensions EXPERIMENTAL; - // ffmpeg command line requires these options in the lower case + // ffmpeg command line requires these options in lower case + @Override public String toString() { return name().toLowerCase(); } } /** - * Log level options : https://ffmpeg.org/ffmpeg.html#Generic-options + * Log level options: https://ffmpeg.org/ffmpeg.html#Generic-options */ public enum Verbosity { QUIET, PANIC, FATAL, ERROR, WARNING, INFO, VERBOSE, DEBUG; + @Override public String toString() { return name().toLowerCase(); } @@ -67,7 +69,7 @@ public String toString() { final List extra_args = new ArrayList<>(); // Output - final List outputs = new ArrayList(); + final List outputs = new ArrayList<>(); public FFmpegBuilder overrideOutputFiles(boolean override) { this.override = override; @@ -164,10 +166,10 @@ public FFmpegBuilder addExtraArgs(String... values) { /** - * Create new output file + * Create new output file. * - * @param filename - * @return A new FFmpegOutputBuilder + * @param filename output file path + * @return A new {@link FFmpegBuilder} */ public FFmpegOutputBuilder addOutput(String filename) { FFmpegOutputBuilder output = new FFmpegOutputBuilder(this, filename); @@ -198,7 +200,7 @@ public List build() { args.add("-v", this.verbosity.toString()); if (startOffset != null) { - args.add("-ss").add(FFmpegUtils.millisecondsToString(startOffset)); + args.add("-ss", FFmpegUtils.millisecondsToString(startOffset)); } if (format != null) { @@ -210,20 +212,20 @@ public List build() { } if (progress != null) { - args.add("-progress").add(progress.toString()); + args.add("-progress", progress.toString()); } args.addAll(extra_args); for (String input : inputs) { - args.add("-i").add(input); + args.add("-i", input); } if (pass > 0) { - args.add("-pass").add(Integer.toString(pass)); + args.add("-pass", Integer.toString(pass)); if (pass_prefix != null) { - args.add("-passlogfile").add(pass_prefix); + args.add("-passlogfile", pass_prefix); } } From d476aa7e054b90e8573de2a3dbbebdebd9c2ee0c Mon Sep 17 00:00:00 2001 From: stonio Date: Thu, 23 Jun 2016 17:03:45 +0200 Subject: [PATCH 3/7] StreamSpecifierType - polish Add @Override annotation --- .../java/net/bramp/ffmpeg/builder/StreamSpecifierType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/bramp/ffmpeg/builder/StreamSpecifierType.java b/src/main/java/net/bramp/ffmpeg/builder/StreamSpecifierType.java index 83b09fb9..58e6030b 100644 --- a/src/main/java/net/bramp/ffmpeg/builder/StreamSpecifierType.java +++ b/src/main/java/net/bramp/ffmpeg/builder/StreamSpecifierType.java @@ -36,7 +36,8 @@ public enum StreamSpecifierType { StreamSpecifierType(String prefix) { this.prefix = prefix; } - + + @Override public String toString() { return prefix; } From f7a6f21d7def0887d5853f7e0af23ca792c88c9f Mon Sep 17 00:00:00 2001 From: stonio Date: Thu, 23 Jun 2016 17:15:46 +0200 Subject: [PATCH 4/7] NamedBitsetAdapter - polish --- .../net/bramp/ffmpeg/gson/NamedBitsetAdapter.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/bramp/ffmpeg/gson/NamedBitsetAdapter.java b/src/main/java/net/bramp/ffmpeg/gson/NamedBitsetAdapter.java index 076c93eb..615d38f7 100644 --- a/src/main/java/net/bramp/ffmpeg/gson/NamedBitsetAdapter.java +++ b/src/main/java/net/bramp/ffmpeg/gson/NamedBitsetAdapter.java @@ -41,9 +41,9 @@ protected Optional readBoolean(JsonReader reader) throws IOException { protected void setField(T target, String name, boolean value) throws IllegalAccessException { try { Field f = clazz.getField(name); - if (f.getType().equals(boolean.class)) { + if ((boolean.class.equals(f.getType()))) { f.setBoolean(target, value); - } else if (f.getType().equals(int.class)) { + } else if (int.class.equals(f.getType())) { f.setInt(target, value ? 1 : 0); } @@ -80,9 +80,7 @@ public T read(JsonReader reader) throws IOException { reader.endObject(); return obj; - } catch (InstantiationException e) { - throw new IOException("Reflection error", e); - } catch (IllegalAccessException e) { + } catch (InstantiationException | IllegalAccessException e) { throw new IOException("Reflection error", e); } } @@ -100,11 +98,9 @@ public void write(JsonWriter writer, T value) throws IOException { for (Field f : clazz.getFields()) { try { boolean b; - if (f.getType().equals(boolean.class)) { - + if (boolean.class.equals(f.getType())) { b = f.getBoolean(value); - - } else if (f.getType().equals(int.class)) { + } else if (int.class.equals(f.getType())) { b = f.getInt(value) != 0; } else { continue; From bd51fbfad6a8f3ae4517d6aca4b51af04826a5f8 Mon Sep 17 00:00:00 2001 From: stonio Date: Thu, 23 Jun 2016 17:20:28 +0200 Subject: [PATCH 5/7] FFmpegProgressListener - polish --- .../java/net/bramp/ffmpeg/progress/FFmpegProgressListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/bramp/ffmpeg/progress/FFmpegProgressListener.java b/src/main/java/net/bramp/ffmpeg/progress/FFmpegProgressListener.java index 4a488a0d..f002a1a7 100644 --- a/src/main/java/net/bramp/ffmpeg/progress/FFmpegProgressListener.java +++ b/src/main/java/net/bramp/ffmpeg/progress/FFmpegProgressListener.java @@ -1,5 +1,5 @@ package net.bramp.ffmpeg.progress; public interface FFmpegProgressListener { - public void progress(Progress p); + void progress(Progress progress); } From c2092a2c98fa8747ade17997750424f05e7f5185 Mon Sep 17 00:00:00 2001 From: stonio Date: Thu, 23 Jun 2016 17:25:37 +0200 Subject: [PATCH 6/7] Progress - polish --- .../net/bramp/ffmpeg/progress/Progress.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/bramp/ffmpeg/progress/Progress.java b/src/main/java/net/bramp/ffmpeg/progress/Progress.java index 23e3ec87..c2dcb5b0 100644 --- a/src/main/java/net/bramp/ffmpeg/progress/Progress.java +++ b/src/main/java/net/bramp/ffmpeg/progress/Progress.java @@ -84,9 +84,18 @@ protected boolean parseLine(String line) { @Override public String toString() { - return MoreObjects.toStringHelper(this).add("frame", frame).add("fps", fps) - .add("bitrate", bitrate).add("total_size", total_size).add("out_time_ms", out_time_ms) - .add("dup_frames", dup_frames).add("drop_frames", drop_frames).add("speed", speed) - .add("progress", progress).toString(); + return MoreObjects.toStringHelper(this) + // @formatter:off + .add("frame", frame) + .add("fps", fps) + .add("bitrate", bitrate) + .add("total_size", total_size) + .add("out_time_ms", out_time_ms) + .add("dup_frames", dup_frames) + .add("drop_frames", drop_frames) + .add("speed", speed) + .add("progress", progress) + // @formatter:on + .toString(); } } From b1285d1c7631ab5c6340ef107a7017f043474363 Mon Sep 17 00:00:00 2001 From: stonio Date: Thu, 23 Jun 2016 17:49:08 +0200 Subject: [PATCH 7/7] FFmpegBuilder - Fix Javadoc Fix wrong reference to return class --- src/main/java/net/bramp/ffmpeg/builder/FFmpegBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/bramp/ffmpeg/builder/FFmpegBuilder.java b/src/main/java/net/bramp/ffmpeg/builder/FFmpegBuilder.java index 57e9b81c..b074586c 100644 --- a/src/main/java/net/bramp/ffmpeg/builder/FFmpegBuilder.java +++ b/src/main/java/net/bramp/ffmpeg/builder/FFmpegBuilder.java @@ -169,7 +169,7 @@ public FFmpegBuilder addExtraArgs(String... values) { * Create new output file. * * @param filename output file path - * @return A new {@link FFmpegBuilder} + * @return A new {@link FFmpegOutputBuilder} */ public FFmpegOutputBuilder addOutput(String filename) { FFmpegOutputBuilder output = new FFmpegOutputBuilder(this, filename);