diff --git a/Changelog.md b/Changelog.md index 3f8b3fd..7df46e6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,8 @@ # JAVE2 ## Changelog +- **3.5.0** + - Added support for Tune video attribute, thanks to rayacode - **3.4.0** - Added PresetEnum to API - Added quit encoding to api, thanks to sam80180 diff --git a/README.md b/README.md index 4491410..ad72404 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ It includes all binaries for the supported platforms ws.schild jave-all-deps - 3.4.0 + 3.5.0 ``` @@ -65,7 +65,7 @@ Include the following in your pom files. ws.schild jave-core - 3.4.0 + 3.5.0 ``` @@ -76,7 +76,7 @@ and then the specific jar(s) for your platform(s) : ws.schild jave-nativebin-linux64 - 3.4.0 + 3.5.0 ``` @@ -85,7 +85,7 @@ and then the specific jar(s) for your platform(s) : ws.schild jave-nativebin-linux-arm64 - 3.4.0 + 3.5.0 ``` @@ -94,7 +94,7 @@ and then the specific jar(s) for your platform(s) : ws.schild jave-nativebin-linux-arm32 - 3.4.0 + 3.5.0 ``` @@ -103,7 +103,7 @@ and then the specific jar(s) for your platform(s) : ws.schild jave-nativebin-win64 - 3.4.0 + 3.5.0 ``` @@ -112,7 +112,7 @@ and then the specific jar(s) for your platform(s) : ws.schild jave-nativebin-osx64 - 3.4.0 + 3.5.0 ``` @@ -121,13 +121,13 @@ and then the specific jar(s) for your platform(s) : It includes all binaries for the supported platforms ``` XML -compile group: 'ws.schild', name: 'jave-all-deps', version: '3.4.0' +compile group: 'ws.schild', name: 'jave-all-deps', version: '3.5.0' ``` ### For one platform only (Linux 64Bit in this case) ``` XML -compile group: 'ws.schild', name: 'jave-core', version: '3.4.0' -compile group: 'ws.schild', name: 'jave-nativebin-linux64', version: '3.4.0' +compile group: 'ws.schild', name: 'jave-core', version: '3.5.0' +compile group: 'ws.schild', name: 'jave-nativebin-linux64', version: '3.5.0' ``` ### Main Components of Jave2 diff --git a/jave-all-deps/pom.xml b/jave-all-deps/pom.xml index e8c4062..1c14a3f 100644 --- a/jave-all-deps/pom.xml +++ b/jave-all-deps/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ws.schild jar - 3.4.0 + 3.5.0 jave-all-deps Jave all native dependencies package The JAVE (Java Audio Video Encoder) library is Java wrapper on the @@ -154,47 +154,47 @@ ws.schild jave-core - 3.4.0 + 3.5.0 ws.schild jave-nativebin-win32 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-win64 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-linux32 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-linux64 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-osx64 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-osxm1 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-linux-arm32 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-linux-arm64 - 3.4.0 + 3.5.0 diff --git a/jave-core-test-java11/pom.xml b/jave-core-test-java11/pom.xml index 5bc3a73..9bf8391 100644 --- a/jave-core-test-java11/pom.xml +++ b/jave-core-test-java11/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.4.0 + 3.5.0 jave-core-test-java11 11 @@ -38,32 +38,32 @@ ws.schild jave-core - 3.4.0 + 3.5.0 ws.schild jave-nativebin-win32 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-win64 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-linux32 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-linux64 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-osx64 - 3.4.0 + 3.5.0 diff --git a/jave-core-test/pom.xml b/jave-core-test/pom.xml index 9b11428..afc6d56 100644 --- a/jave-core-test/pom.xml +++ b/jave-core-test/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ws.schild jar - 3.4.0 + 3.5.0 jave-core-test 1.8 @@ -40,32 +40,32 @@ ws.schild jave-core - 3.4.0 + 3.5.0 ws.schild jave-nativebin-win32 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-win64 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-linux32 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-linux64 - 3.4.0 + 3.5.0 ws.schild jave-nativebin-osx64 - 3.4.0 + 3.5.0 diff --git a/jave-core/pom.xml b/jave-core/pom.xml index a90ce73..15e32ec 100644 --- a/jave-core/pom.xml +++ b/jave-core/pom.xml @@ -6,7 +6,7 @@ ws.schild jave-core jar - 3.4.0 + 3.5.0 Jave core package The JAVE (Java Audio Video Encoder) library is Java wrapper on the ffmpeg project. Developers can take take advantage of JAVE2 to transcode diff --git a/jave-core/src/main/java/ws/schild/jave/Encoder.java b/jave-core/src/main/java/ws/schild/jave/Encoder.java index 0aad733..825e12f 100644 --- a/jave-core/src/main/java/ws/schild/jave/Encoder.java +++ b/jave-core/src/main/java/ws/schild/jave/Encoder.java @@ -43,6 +43,7 @@ import ws.schild.jave.encode.ValueArgument; import ws.schild.jave.encode.VideoAttributes; import ws.schild.jave.encode.VideoFilterArgument; +import ws.schild.jave.encode.enums.TuneEnum; import ws.schild.jave.encode.enums.VsyncMethod; import ws.schild.jave.encode.enums.X264_PROFILE; import ws.schild.jave.filters.FilterGraph; @@ -354,7 +355,7 @@ public void encode( } private static List globalOptions = - new ArrayList(Arrays.asList( + new ArrayList<>(Arrays.asList( new ValueArgument(ArgType.GLOBAL, "--filter_thread", ea -> ea.getFilterThreads().map(Object::toString)), new ValueArgument(ArgType.GLOBAL, "-ss", ea -> ea.getOffset().map(Object::toString)), diff --git a/jave-core/src/main/java/ws/schild/jave/encode/VideoAttributes.java b/jave-core/src/main/java/ws/schild/jave/encode/VideoAttributes.java index a1f1711..0e1e41f 100644 --- a/jave-core/src/main/java/ws/schild/jave/encode/VideoAttributes.java +++ b/jave-core/src/main/java/ws/schild/jave/encode/VideoAttributes.java @@ -23,6 +23,7 @@ import java.util.Optional; import ws.schild.jave.Encoder; +import ws.schild.jave.encode.enums.TuneEnum; import ws.schild.jave.encode.enums.VsyncMethod; import ws.schild.jave.encode.enums.X264_PROFILE; import ws.schild.jave.filters.FilterGraph; @@ -307,7 +308,7 @@ public Optional getTune() { return Optional.ofNullable(tune); } /** - * @param TuneEnum the TuneEnum to set + * @param tune the TuneEnum to set * @return this instance */ public VideoAttributes setTune(TuneEnum tune){ diff --git a/jave-core/src/main/java/ws/schild/jave/encode/enums/TuneEnum.java b/jave-core/src/main/java/ws/schild/jave/encode/enums/TuneEnum.java index b5dc826..bdb292d 100644 --- a/jave-core/src/main/java/ws/schild/jave/encode/enums/TuneEnum.java +++ b/jave-core/src/main/java/ws/schild/jave/encode/enums/TuneEnum.java @@ -1,3 +1,5 @@ +package ws.schild.jave.encode.enums; + public enum TuneEnum { FILM("film"),//use for high quality movie content; lowers deblocking ANIMATION("animation"),//good for cartoons; uses higher deblocking and more reference frames diff --git a/jave-core/src/main/java/ws/schild/jave/progress/EncoderProgressAdapter.java b/jave-core/src/main/java/ws/schild/jave/progress/EncoderProgressAdapter.java index 067852c..b568886 100644 --- a/jave-core/src/main/java/ws/schild/jave/progress/EncoderProgressAdapter.java +++ b/jave-core/src/main/java/ws/schild/jave/progress/EncoderProgressAdapter.java @@ -19,7 +19,7 @@ public void sourceInfo(MultimediaInfo info) { @Override public void progress(int permil) { - listener.onProgress(new Double(permil) / 100); + listener.onProgress(Double.valueOf(permil) / 100); } @Override diff --git a/jave-example/pom.xml b/jave-example/pom.xml index 78a724d..a8c49bb 100644 --- a/jave-example/pom.xml +++ b/jave-example/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.4.0 + 3.5.0 jave-example 12 @@ -66,12 +66,12 @@ ws.schild jave-core - 3.4.0 + 3.5.0 ws.schild jave-nativebin-linux32 - 3.4.0 + 3.5.0 diff --git a/jave-nativebin-arm32/pom.xml b/jave-nativebin-arm32/pom.xml index d61207f..06ff76f 100644 --- a/jave-nativebin-arm32/pom.xml +++ b/jave-nativebin-arm32/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.4.0 + 3.5.0 jave-nativebin-linux-arm32 Jave linux arm 32 bit native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the diff --git a/jave-nativebin-arm64/pom.xml b/jave-nativebin-arm64/pom.xml index 9e1066d..874ef27 100644 --- a/jave-nativebin-arm64/pom.xml +++ b/jave-nativebin-arm64/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.4.0 + 3.5.0 jave-nativebin-linux-arm64 Jave linux arm 64 bit native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the diff --git a/jave-nativebin-linux32/pom.xml b/jave-nativebin-linux32/pom.xml index 3c49450..50aef62 100644 --- a/jave-nativebin-linux32/pom.xml +++ b/jave-nativebin-linux32/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.4.0 + 3.5.0 jave-nativebin-linux32 Jave linux 32 bit native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the diff --git a/jave-nativebin-linux64/pom.xml b/jave-nativebin-linux64/pom.xml index 523ff48..e9957d6 100644 --- a/jave-nativebin-linux64/pom.xml +++ b/jave-nativebin-linux64/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.4.0 + 3.5.0 jave-nativebin-linux64 Jave linux 64 bit native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the diff --git a/jave-nativebin-osx64/pom.xml b/jave-nativebin-osx64/pom.xml index d09190e..12ec42e 100644 --- a/jave-nativebin-osx64/pom.xml +++ b/jave-nativebin-osx64/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.4.0 + 3.5.0 jave-nativebin-osx64 Jave OSX 64 bit native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the diff --git a/jave-nativebin-osxm1/pom.xml b/jave-nativebin-osxm1/pom.xml index 8052c7b..3531b6c 100644 --- a/jave-nativebin-osxm1/pom.xml +++ b/jave-nativebin-osxm1/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.4.0 + 3.5.0 jave-nativebin-osxm1 Jave OSX m1 native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the diff --git a/jave-nativebin-win32/pom.xml b/jave-nativebin-win32/pom.xml index 94fabfc..55caa2f 100644 --- a/jave-nativebin-win32/pom.xml +++ b/jave-nativebin-win32/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.4.0 + 3.5.0 jave-nativebin-win32 Jave windows 32 bit native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the diff --git a/jave-nativebin-win64/pom.xml b/jave-nativebin-win64/pom.xml index 35938f0..ab8ca30 100644 --- a/jave-nativebin-win64/pom.xml +++ b/jave-nativebin-win64/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ws.schild jar - 3.4.0 + 3.5.0 jave-nativebin-win64 Jave windows 64 bit native package The JAVE (Java Audio Video Encoder) library is Java wrapper on the diff --git a/pom.xml b/pom.xml index 76b158b..15695fd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ jave-modules pom - 3.4.0 + 3.5.0 1.8 1.8 @@ -13,7 +13,7 @@ UTF-8 - 3.4.0 + 3.5.0 Jave master project Jave master project https://github.com/a-schild/jave2