release 0.16.

KognitionAI · Jul 24, 2022 · fa0526c · fa0526c
1 parent 809fe4d
commit fa0526c
Show file tree

Hide file tree

Showing 14 changed files with 185 additions and 97 deletions.
diff --git a/docker-nginx-rtmp/pom.xml b/docker-nginx-rtmp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>pilecv4j-parent</artifactId>
     <groupId>ai.kognition.pilecv4j</groupId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
   <artifactId>docker-nginx-rtmp</artifactId>
   <packaging>pom</packaging>

diff --git a/lib-ffmpeg/pom.xml b/lib-ffmpeg/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pilecv4j-parent</artifactId>
     <groupId>ai.kognition.pilecv4j</groupId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
   <artifactId>lib-ffmpeg</artifactId>
   <name>lib-ffmpeg (${project.version})</name>
@@ -55,13 +55,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.palantir.docker.compose</groupId>
-      <artifactId>docker-compose-rule-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.palantir.docker.compose</groupId>
-      <artifactId>docker-compose-rule-junit4</artifactId>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>testcontainers</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/lib-ffmpeg/src/test/java/ai/kognition/pilecv4j/ffmpeg/TestFfmpegStreaming.java b/lib-ffmpeg/src/test/java/ai/kognition/pilecv4j/ffmpeg/TestFfmpegStreaming.java
@@ -6,23 +6,17 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import java.net.URI;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.palantir.docker.compose.DockerComposeRule;
-import com.palantir.docker.compose.configuration.ShutdownStrategy;
-import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestRule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import net.dempsy.vfs.Vfs;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import ai.kognition.pilecv4j.ffmpeg.Ffmpeg2.EncodingContext;
 import ai.kognition.pilecv4j.ffmpeg.Ffmpeg2.EncodingContext.VideoEncoder;
@@ -34,34 +28,33 @@ public class TestFfmpegStreaming extends BaseTest {
     private static final Logger LOGGER = LoggerFactory.getLogger(TestFfmpegStreaming.class);
     final int numFrames = SHOW ? 1000 : 10;
 
-    @Rule public final TestRule docker = DockerComposeRule.builder()
-        .file(uncheck(() -> new Vfs().toFile(new URI("classpath:///pilecv4j-rtmp-docker-compose.yml"))).getAbsolutePath())
-        // .waitingForHostNetworkedPort(8080, p -> p.isHttpRespondingSuccessfully(port -> "http://localhost:" + port + "/", false))
-        .waitingForHostNetworkedPort(8080, p -> p.isListeningNow() ? SuccessOrFailure.success() : SuccessOrFailure.failure("not yet"))
-        .removeConflictingContainersOnStartup(true)
-        .shutdownStrategy(ShutdownStrategy.KILL_DOWN)
-        .build();
+    @Rule public GenericContainer<?> docker = new GenericContainer<>(DockerImageName.parse("pilecv4j/nginx-rtmp:latest"))
+        .withExposedPorts(8080, 1935);
 
     @Rule public final TemporaryFolder tempDir = new TemporaryFolder();
 
     @Test
     public void testRemuxStreaming() throws Exception {
+        final int rtmpPort = docker.getMappedPort(1935);
+
+        Thread.sleep(100);
+
         try(final StreamContext c = Ffmpeg2.createStreamContext();
             final ImageDisplay id = SHOW ? new ImageDisplay.Builder().build() : null;) {
 
             final AtomicBoolean checkerFailed = new AtomicBoolean(false);
             final AtomicBoolean finishedSuccessfully = new AtomicBoolean(false);
             final CountDownLatch checkerLatch = new CountDownLatch(1);
 
-            final Thread checker = startChecker(id, numFrames, checkerLatch, () -> c.stop(), finishedSuccessfully, checkerFailed);
+            final Thread checker = startChecker(id, rtmpPort, numFrames, checkerLatch, () -> c.stop(), finishedSuccessfully, checkerFailed);
 
             c
                 .addOption("rtsp_flags", "prefer_tcp")
                 .createMediaDataSource(STREAM)
                 .peek(sc -> sc.load())
                 .peek(sc -> checkerLatch.countDown())
                 .openChain()
-                .createUriRemuxer("flv", "rtmp://localhost:1935/live/feedly-id")
+                .createUriRemuxer("flv", "rtmp://localhost:" + rtmpPort + "/live/feedly-id")
                 .streamContext()
                 .sync()
                 .play();
@@ -75,6 +68,9 @@ public void testRemuxStreaming() throws Exception {
 
     @Test
     public void testEncodingStream() throws Exception {
+        final int rtmpPort = docker.getMappedPort(1935);
+        Thread.sleep(100);
+
         try(
             final EncodingContext encoder = Ffmpeg2.createEncoder();
             final StreamContext ctx = Ffmpeg2.createStreamContext();
@@ -87,10 +83,10 @@ public void testEncodingStream() throws Exception {
             final CountDownLatch checkerLatch = new CountDownLatch(1);
             final AtomicBoolean triggerWhenDone = new AtomicBoolean(false);
 
-            final Thread checker = startChecker(id, numFrames, checkerLatch, () -> triggerWhenDone.set(true), finishedSuccessfully, checkerFailed);
+            final Thread checker = startChecker(id, rtmpPort, numFrames, checkerLatch, () -> triggerWhenDone.set(true), finishedSuccessfully, checkerFailed);
 
             encoder
-                .outputStream("flv", "rtmp://localhost:1935/live/feedly-id")
+                .outputStream("flv", "rtmp://localhost:" + rtmpPort + "/live/feedly-id")
                 .openVideoEncoder("libx264", "default")
                 .addCodecOptions("profile", "baseline")
                 .addCodecOptions("preset", "ultrafast")
@@ -142,8 +138,8 @@ public void testEncodingStream() throws Exception {
 
     }
 
-    private static Thread startChecker(final ImageDisplay id, final int numFrames, final CountDownLatch checkerLatch, final Runnable triggerWhenDone,
-        final AtomicBoolean finishedSuccessfully, final AtomicBoolean checkerFailed) {
+    private static Thread startChecker(final ImageDisplay id, final int rtmpPort, final int numFrames, final CountDownLatch checkerLatch,
+        final Runnable triggerWhenDone, final AtomicBoolean finishedSuccessfully, final AtomicBoolean checkerFailed) {
         final Thread checker = new Thread(() -> {
             try {
                 uncheck(() -> checkerLatch.await());
@@ -157,7 +153,7 @@ private static Thread startChecker(final ImageDisplay id, final int numFrames, f
                     sc
                         .addOption("flags", "low_delay")
                         .addOption("fflags", "nobuffer")
-                        .createMediaDataSource("rtmp://localhost:1935/live/feedly-id")
+                        .createMediaDataSource("rtmp://localhost:" + rtmpPort + "/live/feedly-id")
                         .openChain()
                         .createFirstVideoStreamSelector()
                         .createVideoFrameProcessor(m -> {

diff --git a/lib-image/pom.xml b/lib-image/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pilecv4j-parent</artifactId>
     <groupId>ai.kognition.pilecv4j</groupId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
   <artifactId>lib-image</artifactId>
   <dependencies> 

diff --git a/lib-nr/pom.xml b/lib-nr/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pilecv4j-parent</artifactId>
     <groupId>ai.kognition.pilecv4j</groupId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
   <artifactId>lib-nr</artifactId>
 

diff --git a/lib-python/pom.xml b/lib-python/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pilecv4j-parent</artifactId>
     <groupId>ai.kognition.pilecv4j</groupId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
 
   <artifactId>lib-python</artifactId>

diff --git a/lib-tf/pom.xml b/lib-tf/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pilecv4j-parent</artifactId>
     <groupId>ai.kognition.pilecv4j</groupId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
   <artifactId>lib-tf</artifactId>
   <dependencies> 

diff --git a/lib-tracking/pom.xml b/lib-tracking/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pilecv4j-parent</artifactId>
     <groupId>ai.kognition.pilecv4j</groupId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/lib-util/pom.xml b/lib-util/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pilecv4j-parent</artifactId>
     <groupId>ai.kognition.pilecv4j</groupId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
   <artifactId>lib-util</artifactId>
 

diff --git a/native-ffmpeg/pom.xml b/native-ffmpeg/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>ai.kognition.pilecv4j</groupId>
     <artifactId>pilecv4j-parent</artifactId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
 
   <artifactId>native-ffmpeg</artifactId>

diff --git a/native-image/pom.xml b/native-image/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>pilecv4j-parent</artifactId>
     <groupId>ai.kognition.pilecv4j</groupId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
 
   <artifactId>native-image</artifactId>

diff --git a/native-nr/pom.xml b/native-nr/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>pilecv4j-parent</artifactId>
     <groupId>ai.kognition.pilecv4j</groupId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
 
   <artifactId>native-nr</artifactId>

diff --git a/native-python/pom.xml b/native-python/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>pilecv4j-parent</artifactId>
     <groupId>ai.kognition.pilecv4j</groupId>
-    <version>0.16-SNAPSHOT</version>
+    <version>0.16</version>
   </parent>
 
   <artifactId>native-python</artifactId>