Skip to content

Commit b132cbc

Browse files
nextbreakpointnextbreakpoint
authored
Merge pull request #8 from nextbreakpoint/dev/7.0.1-1.2
change package name. rename examples and tests modules
2 parents 42872fd + 18a4c32 commit b132cbc

File tree

295 files changed

+799
-2975
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

295 files changed

+799
-2975
lines changed

‎.gitignore‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
11
*.iml
22
.idea
3-
/ffmpeg4java-macos-test/test-frame-10.png
4-
/ffmpeg4java-macos-test/test-frame-20.png
5-
/ffmpeg4java-macos-test/test-frame-30.png
6-
/ffmpeg4java-macos-test/test-frame-40.png
7-
/ffmpeg4java-macos-test/test-video-48.mpg
8-
/ffmpeg4java-linux-test/test-frame-10.png
9-
/ffmpeg4java-linux-test/test-frame-20.png
10-
/ffmpeg4java-linux-test/test-frame-30.png
11-
/ffmpeg4java-linux-test/test-frame-40.png
12-
/ffmpeg4java-linux-test/test-video-48.mpg
13-
/ffmpeg4java-windows-test/test-frame-10.png
14-
/ffmpeg4java-windows-test/test-frame-20.png
15-
/ffmpeg4java-windows-test/test-frame-30.png
16-
/ffmpeg4java-windows-test/test-frame-40.png
17-
/ffmpeg4java-windows-test/test-video-48.mpg
183
/ffmpeg4java-macos/native/ffmpeg/
194
/ffmpeg4java-linux/native/ffmpeg/
205
/ffmpeg4java-windows/native/ffmpeg/
216
/ffmpeg4java-windows/src/main/resources/ffmpeg4java.dll
227
/ffmpeg4java-linux/src/main/resources/libffmpeg4java.so
238
/ffmpeg4java-macos/src/main/resources/libffmpeg4java.dylib
24-
/ffmpeg4java-macos-examples/output.mp4
25-
/ffmpeg4java-linux-examples/output.mp4
26-
/ffmpeg4java-windows-examples/output.mp4
9+
/ffmpeg4java-examples/output.mp4
10+
/ffmpeg4java-tests/test-frame-10.png
11+
/ffmpeg4java-tests/test-frame-20.png
12+
/ffmpeg4java-tests/test-frame-30.png
13+
/ffmpeg4java-tests/test-frame-40.png
14+
/ffmpeg4java-tests/test-video-48.mpg

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ dump:
3030
verify:
3131
test $(system)
3232
@echo System = $(system)
33-
#MAVEN_OPTS="--enable-preview --enable-native-access=ALL-UNNAMED -Djava.library.path=ffmpeg4java-$(system)-test/target/lib -Djextract.trace.downcalls=false -Xlog:library" mvn verify -P$(system)
34-
MAVEN_OPTS="--enable-preview --enable-native-access=ALL-UNNAMED -Djava.library.path=ffmpeg4java-$(system)-test/target/lib -Djextract.trace.downcalls=false $(properties)" mvn verify -P$(system)
33+
#MAVEN_OPTS="--enable-preview --enable-native-access=ALL-UNNAMED -Djava.library.path=ffmpeg4java-tests/target/lib -Djextract.trace.downcalls=false -Xlog:library" mvn verify -P$(system)
34+
MAVEN_OPTS="--enable-preview --enable-native-access=ALL-UNNAMED -Djava.library.path=ffmpeg4java-tests/target/lib -Djextract.trace.downcalls=false $(properties)" mvn verify -P$(system)
3535

3636
.PHONY: copy-legal
3737
copy-legal:

‎README.md‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
# FFmpeg4Java 7.0.1-1.1
1+
# FFmpeg4Java 7.0.1-1.2
22

33
FFmpeg4Java provides a Java wrapper of FFmpeg library version 7.0.1.
44

5+
Please note that starting from version 7.0.1-1.0 the wrapper requires Java 22 and the Java FFM API (which is still in preview).
6+
Older versions of the wrapper still work with Java 11 or later, but they use JNI with an old version of FFmpeg.
7+
58

69
## License
710

@@ -54,19 +57,19 @@ If you are using Maven, add one of the following dependencies in your POM:
5457
<dependency>
5558
<groupId>com.nextbreakpoint</groupId>
5659
<artifactId>com.nextbreakpoint.ffmpeg4java.macos</artifactId>
57-
<version>7.0.1-1.1</version>
60+
<version>7.0.1-1.2</version>
5861
</dependency>
5962

6063
<dependency>
6164
<groupId>com.nextbreakpoint</groupId>
6265
<artifactId>com.nextbreakpoint.ffmpeg4java.linux</artifactId>
63-
<version>7.0.1-1.1</version>
66+
<version>7.0.1-1.2</version>
6467
</dependency>
6568

6669
<dependency>
6770
<groupId>com.nextbreakpoint</groupId>
6871
<artifactId>com.nextbreakpoint.ffmpeg4java.windows</artifactId>
69-
<version>7.0.1-1.1</version>
72+
<version>7.0.1-1.2</version>
7073
</dependency>
7174

7275
Also, add one of the following to download the native library:
@@ -226,25 +229,25 @@ Compile and package the JARs:
226229

227230
The artifacts will be created in the target directory of each module:
228231

229-
ffmpeg4java-macos/target/com.nextbreakpoint.ffmpeg4java.macos-7.0.1-1.1-x86_64.jar
230-
ffmpeg4java-macos/target/com.nextbreakpoint.ffmpeg4java.macos-7.0.1-1.1-x86_64-x86_64.jar
232+
ffmpeg4java-macos/target/com.nextbreakpoint.ffmpeg4java.macos-7.0.1-1.2-x86_64.jar
233+
ffmpeg4java-macos/target/com.nextbreakpoint.ffmpeg4java.macos-7.0.1-1.2-x86_64-x86_64.jar
231234

232-
ffmpeg4java-linux/target/com.nextbreakpoint.ffmpeg4java.linux-7.0.1-1.1-x86_64.jar
233-
ffmpeg4java-linux/target/com.nextbreakpoint.ffmpeg4java.linux-7.0.1-1.1-x86_64-x86_64.jar
235+
ffmpeg4java-linux/target/com.nextbreakpoint.ffmpeg4java.linux-7.0.1-1.2-x86_64.jar
236+
ffmpeg4java-linux/target/com.nextbreakpoint.ffmpeg4java.linux-7.0.1-1.2-x86_64-x86_64.jar
234237

235-
ffmpeg4java-windows/target/com.nextbreakpoint.ffmpeg4java.windows-7.0.1-1.1-x86_64.jar
236-
ffmpeg4java-windows/target/com.nextbreakpoint.ffmpeg4java.windows-7.0.1-1.1-x86_64-x86_64.jar
238+
ffmpeg4java-windows/target/com.nextbreakpoint.ffmpeg4java.windows-7.0.1-1.2-x86_64.jar
239+
ffmpeg4java-windows/target/com.nextbreakpoint.ffmpeg4java.windows-7.0.1-1.2-x86_64-x86_64.jar
237240

238241
List the content of the JAR files:
239242

240-
unzip -t ffmpeg4java-macos/target/com.nextbreakpoint.ffmpeg4java.macos-7.0.1-1.1.jar
241-
unzip -t ffmpeg4java-macos/target/com.nextbreakpoint.ffmpeg4java.macos-7.0.1-1.1-x86_64.jar
243+
unzip -t ffmpeg4java-macos/target/com.nextbreakpoint.ffmpeg4java.macos-7.0.1-1.2.jar
244+
unzip -t ffmpeg4java-macos/target/com.nextbreakpoint.ffmpeg4java.macos-7.0.1-1.2-x86_64.jar
242245

243-
unzip -t ffmpeg4java-linux/target/com.nextbreakpoint.ffmpeg4java.linux-7.0.1-1.1.jar
244-
unzip -t ffmpeg4java-linux/target/com.nextbreakpoint.ffmpeg4java.linux-7.0.1-1.1-x86_64.jar
246+
unzip -t ffmpeg4java-linux/target/com.nextbreakpoint.ffmpeg4java.linux-7.0.1-1.2.jar
247+
unzip -t ffmpeg4java-linux/target/com.nextbreakpoint.ffmpeg4java.linux-7.0.1-1.2-x86_64.jar
245248

246-
unzip -t ffmpeg4java-windows/target/com.nextbreakpoint.ffmpeg4java.windows-7.0.1-1.1.jar
247-
unzip -t ffmpeg4java-windows/target/com.nextbreakpoint.ffmpeg4java.windows-7.0.1-1.1-x86_64.jar
249+
unzip -t ffmpeg4java-windows/target/com.nextbreakpoint.ffmpeg4java.windows-7.0.1-1.2.jar
250+
unzip -t ffmpeg4java-windows/target/com.nextbreakpoint.ffmpeg4java.windows-7.0.1-1.2-x86_64.jar
248251

249252
Install the artifacts in your local Maven repository:
250253

@@ -287,15 +290,11 @@ Generate the code for Windows (must be executed on Windows):
287290

288291
## Code examples
289292

290-
A simple example is provided for each supported system.
291-
292-
See POM files for details about how to download the native library and execute the code:
293-
294-
ffmpeg4java-macos-examples/pom.xml
293+
A simple example is provided for the module ffmpeg4Java-examples.
295294

296-
ffmpeg4java-linux-examples/pom.xml
295+
See the POM file for details about how to download the native library and execute the example:
297296

298-
ffmpeg4java-windows-examples/pom.xml
297+
ffmpeg4java-examples/pom.xml
299298

300299

301300
## References

‎ffmpeg4java-examples/pom.xml‎

Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>com.nextbreakpoint</groupId>
6+
<artifactId>com.nextbreakpoint.ffmpeg4java</artifactId>
7+
<version>7.0.1-1.2</version>
8+
</parent>
9+
<artifactId>com.nextbreakpoint.ffmpeg4java.examples</artifactId>
10+
<packaging>jar</packaging>
11+
<name>FFmpeg4Java Examples</name>
12+
<description>FFmpeg4Java provides a Java wrapper of FFmpeg library</description>
13+
<profiles>
14+
<profile>
15+
<id>macos</id>
16+
<properties>
17+
<arch.type>x86_64</arch.type>
18+
<os.type>macos</os.type>
19+
</properties>
20+
<dependencies>
21+
<dependency>
22+
<groupId>com.nextbreakpoint</groupId>
23+
<artifactId>com.nextbreakpoint.ffmpeg4java.macos</artifactId>
24+
<version>${project.version}</version>
25+
</dependency>
26+
</dependencies>
27+
<build>
28+
<plugins>
29+
<plugin>
30+
<groupId>org.apache.maven.plugins</groupId>
31+
<artifactId>maven-dependency-plugin</artifactId>
32+
<executions>
33+
<execution>
34+
<id>copy-lib</id>
35+
<phase>test-compile</phase>
36+
<goals>
37+
<goal>unpack</goal>
38+
</goals>
39+
<configuration>
40+
<artifactItems>
41+
<artifactItem>
42+
<groupId>com.nextbreakpoint</groupId>
43+
<artifactId>com.nextbreakpoint.ffmpeg4java.macos</artifactId>
44+
<classifier>x86_64</classifier>
45+
<type>jar</type>
46+
<overWrite>true</overWrite>
47+
<outputDirectory>${project.build.directory}/lib</outputDirectory>
48+
</artifactItem>
49+
</artifactItems>
50+
<includes>**/*.dylib</includes>
51+
</configuration>
52+
</execution>
53+
</executions>
54+
</plugin>
55+
</plugins>
56+
</build>
57+
</profile>
58+
<profile>
59+
<id>linux</id>
60+
<properties>
61+
<arch.type>x86_64</arch.type>
62+
<os.type>linux</os.type>
63+
</properties>
64+
<dependencies>
65+
<dependency>
66+
<groupId>com.nextbreakpoint</groupId>
67+
<artifactId>com.nextbreakpoint.ffmpeg4java.linux</artifactId>
68+
<version>${project.version}</version>
69+
</dependency>
70+
</dependencies>
71+
<build>
72+
<plugins>
73+
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-dependency-plugin</artifactId>
76+
<executions>
77+
<execution>
78+
<id>copy-lib</id>
79+
<phase>test-compile</phase>
80+
<goals>
81+
<goal>unpack</goal>
82+
</goals>
83+
<configuration>
84+
<artifactItems>
85+
<artifactItem>
86+
<groupId>com.nextbreakpoint</groupId>
87+
<artifactId>com.nextbreakpoint.ffmpeg4java.linux</artifactId>
88+
<classifier>x86_64</classifier>
89+
<type>jar</type>
90+
<overWrite>true</overWrite>
91+
<outputDirectory>${project.build.directory}/lib</outputDirectory>
92+
</artifactItem>
93+
</artifactItems>
94+
<includes>**/*.so</includes>
95+
</configuration>
96+
</execution>
97+
</executions>
98+
</plugin>
99+
</plugins>
100+
</build>
101+
</profile>
102+
<profile>
103+
<id>windows</id>
104+
<properties>
105+
<arch.type>x86_64</arch.type>
106+
<os.type>windows</os.type>
107+
</properties>
108+
<dependencies>
109+
<dependency>
110+
<groupId>com.nextbreakpoint</groupId>
111+
<artifactId>com.nextbreakpoint.ffmpeg4java.windows</artifactId>
112+
<version>${project.version}</version>
113+
</dependency>
114+
</dependencies>
115+
<build>
116+
<plugins>
117+
<plugin>
118+
<groupId>org.apache.maven.plugins</groupId>
119+
<artifactId>maven-dependency-plugin</artifactId>
120+
<executions>
121+
<execution>
122+
<id>copy-lib</id>
123+
<phase>test-compile</phase>
124+
<goals>
125+
<goal>unpack</goal>
126+
</goals>
127+
<configuration>
128+
<artifactItems>
129+
<artifactItem>
130+
<groupId>com.nextbreakpoint</groupId>
131+
<artifactId>com.nextbreakpoint.ffmpeg4java.windows</artifactId>
132+
<classifier>x86_64</classifier>
133+
<type>jar</type>
134+
<overWrite>true</overWrite>
135+
<outputDirectory>${project.build.directory}/lib</outputDirectory>
136+
</artifactItem>
137+
</artifactItems>
138+
<includes>**/*.dll</includes>
139+
</configuration>
140+
</execution>
141+
</executions>
142+
</plugin>
143+
</plugins>
144+
</build>
145+
</profile>
146+
</profiles>
147+
<build>
148+
<plugins>
149+
<plugin>
150+
<groupId>org.codehaus.mojo</groupId>
151+
<artifactId>exec-maven-plugin</artifactId>
152+
<executions>
153+
<execution>
154+
<id>run</id>
155+
<phase>test</phase>
156+
<goals>
157+
<goal>exec</goal>
158+
</goals>
159+
<configuration>
160+
<executable>java</executable>
161+
<arguments>
162+
<argument>--enable-preview</argument>
163+
<argument>--enable-native-access=ALL-UNNAMED</argument>
164+
<argument>-classpath</argument>
165+
<classpath/>
166+
<argument>-Djava.library.path=${project.build.directory}/lib</argument>
167+
<argument>com.nextbreakpoint.ffmpeg4java.ConvertVideoMain</argument>
168+
<argument>sample.mpg</argument>
169+
<argument>output.mp4</argument>
170+
</arguments>
171+
</configuration>
172+
</execution>
173+
</executions>
174+
</plugin>
175+
</plugins>
176+
</build>
177+
</project>

‎ffmpeg4java-linux-examples/sample.mpg‎ renamed to ‎ffmpeg4java-examples/sample.mpg‎

File renamed without changes.

0 commit comments

Comments
 (0)