Skip to content

Commit

Permalink
Updated maven build environment
Browse files Browse the repository at this point in the history 
Updated tests
Release 3.4.0
  • Loading branch information
@a-schild
a-schild committed Nov 11, 2023
1 parent 02da387 commit ab43d17
Show file tree
Hide file tree
Showing 26 changed files with 334 additions and 305 deletions.
4 changes: 4 additions & 0 deletions Changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
## Changelog
- **3.4.0**
- Added PresetEnum to API
- Added quit encoding to api, thanks to sam80180
- Added module name for java 9+ compatibility, thanks to Stickerifier
- Use proper class for semaphore, thanks to leeychee
- Updated maven build environment
- **3.3.1**
- Fixed naming of binary for OSX M1 platform
- Windows 64bit + 32bit binary on 4.4.1 too
Expand Down
23 changes: 12 additions & 11 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ see the JAVE manual for details.

| Operating System | Windows x32,x64 | MacOS x64 | MacOS m1 | Linux x32,x64 | Linux arm32,arm64 |
| ------------- | ------------- | ------------- | ------------- | ------------- | ------------- |
| Supported? | YES | YES | YES | YES | YES |
| Supported? | YES | Partial,YES | YES | YES | YES |

Please note that the arm+win 32 bit versions are still on 4.4.0
The win32 binaries will be removed in the next release

## Projects using Jave2
* [XR3Player](https://github.com/goxr3plus/XR3Player)
Expand All @@ -50,7 +51,7 @@ It includes all binaries for the supported platforms
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-all-deps</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
```

Expand All @@ -64,7 +65,7 @@ Include the following in your pom files.
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-core</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
```

Expand All @@ -75,7 +76,7 @@ and then the specific jar(s) for your platform(s) :
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-linux64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
```

Expand All @@ -84,7 +85,7 @@ and then the specific jar(s) for your platform(s) :
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-linux-arm64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
```

Expand All @@ -93,7 +94,7 @@ and then the specific jar(s) for your platform(s) :
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-linux-arm32</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
```

Expand All @@ -102,7 +103,7 @@ and then the specific jar(s) for your platform(s) :
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-win64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
```

Expand All @@ -111,7 +112,7 @@ and then the specific jar(s) for your platform(s) :
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-osx64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
```

Expand All @@ -120,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.3.1'
compile group: 'ws.schild', name: 'jave-all-deps', version: '3.4.0'
```

### For one platform only (Linux 64Bit in this case)
``` XML
compile group: 'ws.schild', name: 'jave-core', version: '3.3.1'
compile group: 'ws.schild', name: 'jave-nativebin-linux64', version: '3.3.1'
compile group: 'ws.schild', name: 'jave-core', version: '3.4.0'
compile group: 'ws.schild', name: 'jave-nativebin-linux64', version: '3.4.0'
```

### Main Components of Jave2
Expand Down
38 changes: 19 additions & 19 deletions jave-all-deps/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ws.schild</groupId>
<packaging>jar</packaging>
<version>3.3.1</version>
<version>3.4.0</version>
<artifactId>jave-all-deps</artifactId>
<name>Jave all native dependencies package</name>
<description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the
Expand Down Expand Up @@ -35,16 +35,16 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<maven-deploy-plugin.version>3.0.1-M1</maven-deploy-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<maven-scm-provider-gitexe.version>1.11.2</maven-scm-provider-gitexe.version>
<junit-jupiter-api.version>5.4.2</junit-jupiter-api.version>
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
<maven-scm-provider-gitexe.version>2.0.1</maven-scm-provider-gitexe.version>
<junit-jupiter-api.version>5.10.1</junit-jupiter-api.version>
</properties>

<build>
Expand Down Expand Up @@ -154,47 +154,47 @@
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-core</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-win32</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-win64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-linux32</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-linux64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-osx64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-osxm1</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-linux-arm32</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-linux-arm64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
<dependency>
Expand Down
20 changes: 10 additions & 10 deletions jave-core-test-java11/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ws.schild</groupId>
<packaging>jar</packaging>
<version>3.3.1</version>
<version>3.4.0</version>
<artifactId>jave-core-test-java11</artifactId>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<junit-jupiter-api.version>5.4.2</junit-jupiter-api.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<junit-jupiter-api.version>5.10.1</junit-jupiter-api.version>
<slf4j-simple.version>1.7.26</slf4j-simple.version>
</properties>
<build>
Expand All @@ -38,32 +38,32 @@
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-core</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-win32</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-win64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-linux32</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-linux64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-osx64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
<dependency>
Expand Down
20 changes: 10 additions & 10 deletions jave-core-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ws.schild</groupId>
<packaging>jar</packaging>
<version>3.3.1</version>
<version>3.4.0</version>
<artifactId>jave-core-test</artifactId>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<junit-jupiter-api.version>5.4.2</junit-jupiter-api.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<junit-jupiter-api.version>5.10.1</junit-jupiter-api.version>
<slf4j-simple.version>1.7.26</slf4j-simple.version>
</properties>
<build>
Expand All @@ -40,32 +40,32 @@
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-core</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-win32</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-win64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-linux32</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-linux64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-nativebin-osx64</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions jave-core-test/src/test/java/ws/schild/jave/ConcatEncoderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void testConcatVideo1() throws Exception {
video.setComplexFiltergraph(complexFiltergraph);
encoder.encode(src, target, attrs);
assertTrue(target.exists(), "Output file missing");
assertTrue(target.length() == 107384, "Output file incorrect size");
assertTrue(target.length() == 107872, "Output file incorrect size, expecting 107872 bytes, got "+target.length());
}

/**
Expand Down Expand Up @@ -126,7 +126,7 @@ public void testConcatVideo2() throws Exception {

encoder.encode(src, target, attrs);
assertTrue(target.exists(), "Output file missing");
assertTrue(target.length() == 1368738, "Output file incorrect size");
assertTrue(target.length() == 1360228, "Output file incorrect size, expecting 1360228 bytes, got "+target.length());
}

@Test
Expand Down Expand Up @@ -162,7 +162,7 @@ public void testContactAudio01() throws Exception {
attributes.setVideoAttributes(video);
encoder.encode(src, target, attributes);
assertTrue(target.exists(), "Output file missing");
assertTrue(target.length() == 20477182, "Output file incorrect size");
assertTrue(target.length() == 20477182, "Output file incorrect size, expecting 20477182 bytes, got "+target.length());
}

}
2 changes: 0 additions & 2 deletions jave-core-test/src/test/java/ws/schild/jave/filters/ScaleFilterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@
package ws.schild.jave.filters;

import java.io.File;
import static jdk.nashorn.internal.objects.NativeRegExp.source;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import ws.schild.jave.AMediaTest;
import ws.schild.jave.Encoder;
import ws.schild.jave.EncoderException;
import ws.schild.jave.MultimediaObject;
import ws.schild.jave.encode.AudioAttributes;
import ws.schild.jave.encode.EncodingAttributes;
Expand Down
7 changes: 7 additions & 0 deletions jave-core-test/src/test/java/ws/schild/jave/filters/VideoFilterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,13 @@ public void thatTrimAndWatermarkFilterProducesCorrectFiltergraphs() throws Excep
.collect(Collectors.toList());
File fooPng = new File("foo.png");
String fooPath = fooPng.getAbsolutePath();
// Check for windows path
String os = System.getProperty("os.name").toLowerCase();
boolean isWindows = os.contains("windows");
if (isWindows) {
fooPath= fooPath.replace("\\", "\\\\");
fooPath= fooPath.replace(":", "\\:");
}

assertEquals(
"[0]trim='duration=1.0:start=0.5',setpts='PTS-STARTPTS'[filtered0];"
Expand Down
Loading

0 comments on commit ab43d17

Please sign in to comment.