bumped videolan-natives to 4.8.5 + porting VLCJ

WaterMediaTeam · May 29, 2024 · 9eb4592 · 9eb4592
1 parent e4996ea
commit 9eb4592
Show file tree

Hide file tree

Showing 45 changed files with 184 additions and 300 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,12 +44,14 @@ configurations {
 }
 
 sourceSets {
-    test.compileClasspath += configurations.library
-    test.runtimeClasspath += configurations.library
+    // SHADOW
     test.compileClasspath += configurations.shadow
     test.runtimeClasspath += configurations.shadow
 
+    // LIBRARY
     main.compileClasspath += configurations.library
+    test.compileClasspath += configurations.library
+    test.runtimeClasspath += configurations.library
 }
 
 dependencies {
@@ -60,7 +62,8 @@ dependencies {
     }
 
     // DEPENDENCIES
-    shadow "com.github.sealedtx:java-youtube-downloader:$jyd_version"
+    shadow "com.github.WaterMediaTeam:videolan-natives:$vlcj_natives_version"
+    shadow "com.github.WaterMediaTeam:ytdl-java:$jyd_version"
     shadow "org.apache.commons:commons-compress:$commoncompress_version" // CARRIES 'CODEC', 'LANG3' AND 'COMMONS-IO'
     shadow "org.tukaani:xz:$tukaani_version"
     shadow project(":lib-vlcj")

diff --git a/gradle.properties b/gradle.properties
@@ -46,7 +46,7 @@ description=Library with an API using VLC for multimedia integration with Minecr
 fabric_version=0.14.19
 forge_version=unknown
 jyd_version=3.2.3
-vlcj_natives_version=4.8.4
+vlcj_natives_version=4.8.5
 commoncompress_version=1.26.1
 commonslang3_version=3.12.0
 commonsio_version=2.7

diff --git a/lib-vlcj/build.gradle b/lib-vlcj/build.gradle
@@ -19,17 +19,8 @@ repositories {
     maven { url 'https://jitpack.io' }
 }
 
-configurations {
-    api
-}
-
-sourceSets {
-    main.compileClasspath += configurations.api
-    main.runtimeClasspath += configurations.api
-}
-
 dependencies {
-    api "com.github.WaterMediaTeam:videolan-natives:$vlcj_natives_version"
+    implementation "com.github.WaterMediaTeam:videolan-natives:$vlcj_natives_version"
     compileOnly 'uk.co.caprica:vlcj-osx-stubs:1.0.0'
     compileOnly 'net.java.dev.jna:jna:4.4.0'
     compileOnly 'net.java.dev.jna:platform:3.4.0'
@@ -47,14 +38,4 @@ jar {
         attributes "Implementation-Vendor": authors
         attributes "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
     }
-
-    from {
-        configurations.api.collect {
-            it.isDirectory() ? it.matching {
-                exclude '*', 'META-INF/**'
-            } : zipTree(it).matching {
-                exclude '*', 'META-INF/**'
-            }
-        }
-    }
 }
diff --git a/lib-vlcj/src/main/java/uk/co/caprica/vlcj/VideoLan4J.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/VideoLan4J.java
diff --git a/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/AudioApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/AudioApi.java
@@ -19,10 +19,10 @@
 
 package uk.co.caprica.vlcj.factory;
 
+import uk.co.caprica.vlcj.VideoLan4J;
 import uk.co.caprica.vlcj.binding.internal.libvlc_audio_output_device_t;
 import uk.co.caprica.vlcj.binding.internal.libvlc_audio_output_t;
 import uk.co.caprica.vlcj.binding.lib.LibVlc;
-import uk.co.caprica.vlcj.binding.support.strings.NativeString;
 import uk.co.caprica.vlcj.player.base.AudioDevice;
 
 import java.util.ArrayList;
@@ -51,8 +51,8 @@ public List<AudioOutput> audioOutputs() {
         if (audioOutputs != null) {
             libvlc_audio_output_t audioOutput = audioOutputs;
             while (audioOutput != null) {
-                String name = NativeString.copyNativeString(audioOutput.psz_name);
-                String description = NativeString.copyNativeString(audioOutput.psz_description);
+                String name = VideoLan4J.copyNativeString(audioOutput.psz_name);
+                String description = VideoLan4J.copyNativeString(audioOutput.psz_description);
                 result.add(new AudioOutput(name, description, getAudioOutputDevices(name)));
                 audioOutput = audioOutput.p_next;
             }
@@ -73,8 +73,8 @@ private List<AudioDevice> getAudioOutputDevices(String outputName) {
         if (audioDevices != null) {
             libvlc_audio_output_device_t audioDevice = audioDevices;
             while(audioDevice != null) {
-                String device = NativeString.copyNativeString(audioDevice.psz_device);
-                String description = NativeString.copyNativeString(audioDevice.psz_description);
+                String device = VideoLan4J.copyNativeString(audioDevice.psz_device);
+                String description = VideoLan4J.copyNativeString(audioDevice.psz_description);
                 result.add(new AudioDevice(device, description));
                 audioDevice = audioDevice.p_next;
             }

diff --git a/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/MediaDiscovererApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/MediaDiscovererApi.java
@@ -25,7 +25,7 @@
 import uk.co.caprica.vlcj.binding.internal.libvlc_media_discoverer_description_t;
 import uk.co.caprica.vlcj.binding.internal.libvlc_media_discoverer_t;
 import uk.co.caprica.vlcj.binding.lib.LibVlc;
-import uk.co.caprica.vlcj.binding.support.types.size_t;
+import uk.co.caprica.vlcj.binding.lib.types.size_t;
 import uk.co.caprica.vlcj.media.discoverer.MediaDiscoverer;
 import uk.co.caprica.vlcj.media.discoverer.MediaDiscovererCategory;
 import uk.co.caprica.vlcj.media.discoverer.MediaDiscovererDescription;

diff --git a/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/RendererApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/RendererApi.java
@@ -25,7 +25,7 @@
 import uk.co.caprica.vlcj.binding.internal.libvlc_rd_description_t;
 import uk.co.caprica.vlcj.binding.internal.libvlc_renderer_discoverer_t;
 import uk.co.caprica.vlcj.binding.lib.LibVlc;
-import uk.co.caprica.vlcj.binding.support.types.size_t;
+import uk.co.caprica.vlcj.binding.lib.types.size_t;
 import uk.co.caprica.vlcj.player.renderer.RendererDiscoverer;
 import uk.co.caprica.vlcj.player.renderer.RendererDiscovererDescription;
 

diff --git a/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/NativeDiscovery.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/NativeDiscovery.java
@@ -2,19 +2,19 @@
 
 import com.sun.jna.NativeLibrary;
 import com.sun.jna.StringArray;
-import uk.co.caprica.vlcj.binding.lib.LibVlc;
-import uk.co.caprica.vlcj.binding.support.runtime.RuntimeUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.MarkerManager;
+import uk.co.caprica.vlcj.VideoLan4J;
 import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
 import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
 import uk.co.caprica.vlcj.factory.discovery.strategy.LinuxNativeDiscoveryStrategy;
 import uk.co.caprica.vlcj.factory.discovery.strategy.NativeDiscoveryStrategy;
 import uk.co.caprica.vlcj.factory.discovery.strategy.OsxNativeDiscoveryStrategy;
 import uk.co.caprica.vlcj.factory.discovery.strategy.WindowsNativeDiscoveryStrategy;
 import uk.co.caprica.vlcj.support.version.LibVlcVersion;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.MarkerManager;
 
 import java.lang.ref.Reference;
 import java.lang.reflect.Field;
@@ -119,7 +119,7 @@ public final boolean discover() {
                     String path = discoveryStrategy.discover();
                     if (path != null) {
                         if (discoveryStrategy.onFound(path)) {
-                            NativeLibrary.addSearchPath(RuntimeUtil.getLibVlcLibraryName(), path);
+                            NativeLibrary.addSearchPath(VideoLan4J.LIBVLC_NAME, path);
                         }
                         tryPluginPath(path, discoveryStrategy);
                         if (tryLoadingLibrary()) {
@@ -166,10 +166,10 @@ public boolean attemptFix() {
 
             Map<String, Reference<NativeLibrary>> libs = (Map<String, Reference<NativeLibrary>>) libraries.get(null);
             Map<String, List<String>> paths = (Map<String, List<String>>) searchPaths.get(null);
-            libs.remove(RuntimeUtil.getLibVlcCoreLibraryName());
-            paths.remove(RuntimeUtil.getLibVlcCoreLibraryName());
-            libs.remove(RuntimeUtil.getLibVlcLibraryName());
-            paths.remove(RuntimeUtil.getLibVlcLibraryName());
+            libs.remove(VideoLan4J.LIBVLCCORE_NAME);
+            paths.remove(VideoLan4J.LIBVLCCORE_NAME);
+            libs.remove(VideoLan4J.LIBVLC_NAME);
+            paths.remove(VideoLan4J.LIBVLC_NAME);
             return true;
         } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {
             LOGGER.error(IT, "attemptFix failed", e);

diff --git a/.../src/main/java/uk/co/caprica/vlcj/factory/discovery/provider/CustomDirectoryProvider.java b/.../src/main/java/uk/co/caprica/vlcj/factory/discovery/provider/CustomDirectoryProvider.java
diff --git a/...n/java/uk/co/caprica/vlcj/factory/discovery/provider/LinuxWellKnownDirectoryProvider.java b/...n/java/uk/co/caprica/vlcj/factory/discovery/provider/LinuxWellKnownDirectoryProvider.java
@@ -19,7 +19,7 @@
 
 package uk.co.caprica.vlcj.factory.discovery.provider;
 
-import uk.co.caprica.vlcj.binding.support.runtime.RuntimeUtil;
+import com.sun.jna.Platform;
 
 /**
  * Implementation of a directory provider that returns a list of well-known directory locations to search on Linux.
@@ -51,6 +51,6 @@ public String[] directories() {
 
     @Override
     public boolean supported() {
-        return RuntimeUtil.isNix();
+        return Platform.isLinux();
     }
 }
diff --git a/...ain/java/uk/co/caprica/vlcj/factory/discovery/provider/OsxWellKnownDirectoryProvider.java b/...ain/java/uk/co/caprica/vlcj/factory/discovery/provider/OsxWellKnownDirectoryProvider.java
@@ -19,7 +19,7 @@
 
 package uk.co.caprica.vlcj.factory.discovery.provider;
 
-import uk.co.caprica.vlcj.binding.support.runtime.RuntimeUtil;
+import com.sun.jna.Platform;
 
 /**
  * Implementation of a directory provider that returns a list of well-known directory locations to search on OSX.
@@ -38,7 +38,7 @@ public String[] directories() {
 
     @Override
     public boolean supported() {
-        return RuntimeUtil.isMac();
+        return Platform.isMac();
     }
 
 }
diff --git a/...n/java/uk/co/caprica/vlcj/factory/discovery/provider/WindowsInstallDirectoryProvider.java b/...n/java/uk/co/caprica/vlcj/factory/discovery/provider/WindowsInstallDirectoryProvider.java
@@ -19,9 +19,9 @@
 
 package uk.co.caprica.vlcj.factory.discovery.provider;
 
+import com.sun.jna.Platform;
 import com.sun.jna.platform.win32.Advapi32Util;
 import com.sun.jna.platform.win32.WinReg;
-import uk.co.caprica.vlcj.binding.support.runtime.RuntimeUtil;
 import uk.co.caprica.vlcj.factory.discovery.NativeDiscovery;
 
 import java.io.File;
@@ -64,7 +64,7 @@ public String[] directories() {
 
     @Override
     public boolean supported() {
-        return RuntimeUtil.isWindows();
+        return Platform.isWindows();
     }
 
     private String getVlcInstallDir() {

diff --git a/...main/java/uk/co/caprica/vlcj/factory/discovery/strategy/LinuxNativeDiscoveryStrategy.java b/...main/java/uk/co/caprica/vlcj/factory/discovery/strategy/LinuxNativeDiscoveryStrategy.java
@@ -19,8 +19,8 @@
 
 package uk.co.caprica.vlcj.factory.discovery.strategy;
 
+import com.sun.jna.Platform;
 import uk.co.caprica.vlcj.binding.lib.LibC;
-import uk.co.caprica.vlcj.binding.support.runtime.RuntimeUtil;
 import uk.co.caprica.vlcj.factory.discovery.provider.DirectoryProviderDiscoveryStrategy;
 
 /**
@@ -44,7 +44,7 @@ public LinuxNativeDiscoveryStrategy() {
 
     @Override
     public boolean supported() {
-        return RuntimeUtil.isNix();
+        return Platform.isLinux();
     }
 
     @Override

diff --git a/...c/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/OsxNativeDiscoveryStrategy.java b/...c/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/OsxNativeDiscoveryStrategy.java
@@ -20,8 +20,9 @@
 package uk.co.caprica.vlcj.factory.discovery.strategy;
 
 import com.sun.jna.NativeLibrary;
+import com.sun.jna.Platform;
+import uk.co.caprica.vlcj.VideoLan4J;
 import uk.co.caprica.vlcj.binding.lib.LibC;
-import uk.co.caprica.vlcj.binding.support.runtime.RuntimeUtil;
 import uk.co.caprica.vlcj.factory.discovery.provider.DirectoryProviderDiscoveryStrategy;
 
 /**
@@ -47,7 +48,7 @@ public OsxNativeDiscoveryStrategy() {
 
     @Override
     public boolean supported() {
-        return RuntimeUtil.isMac();
+        return Platform.isMac();
     }
 
     @Override
@@ -63,8 +64,8 @@ public boolean onFound(String path) {
      * @param path
      */
     private void forceLoadLibVlcCore(String path) {
-        NativeLibrary.addSearchPath(RuntimeUtil.getLibVlcCoreLibraryName(), path);
-        NativeLibrary.getInstance(RuntimeUtil.getLibVlcCoreLibraryName());
+        NativeLibrary.addSearchPath(VideoLan4J.LIBVLC_NAME, path);
+        NativeLibrary.getInstance(VideoLan4J.LIBVLCCORE_NAME);
     }
 
     @Override

diff --git a/...in/java/uk/co/caprica/vlcj/factory/discovery/strategy/WindowsNativeDiscoveryStrategy.java b/...in/java/uk/co/caprica/vlcj/factory/discovery/strategy/WindowsNativeDiscoveryStrategy.java
@@ -19,8 +19,8 @@
 
 package uk.co.caprica.vlcj.factory.discovery.strategy;
 
+import com.sun.jna.Platform;
 import uk.co.caprica.vlcj.binding.lib.LibC;
-import uk.co.caprica.vlcj.binding.support.runtime.RuntimeUtil;
 import uk.co.caprica.vlcj.factory.discovery.provider.DirectoryProviderDiscoveryStrategy;
 
 /**
@@ -44,7 +44,7 @@ public WindowsNativeDiscoveryStrategy() {
 
     @Override
     public boolean supported() {
-        return RuntimeUtil.isWindows();
+        return Platform.isWindows();
     }
 
     @Override

diff --git a/lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/NativeLog.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/NativeLog.java
@@ -24,12 +24,12 @@
 import com.sun.jna.Pointer;
 import com.sun.jna.ptr.IntByReference;
 import com.sun.jna.ptr.PointerByReference;
+import uk.co.caprica.vlcj.VideoLan4J;
 import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
 import uk.co.caprica.vlcj.binding.internal.libvlc_log_cb;
 import uk.co.caprica.vlcj.binding.internal.libvlc_log_t;
 import uk.co.caprica.vlcj.binding.lib.LibC;
 import uk.co.caprica.vlcj.binding.lib.LibVlc;
-import uk.co.caprica.vlcj.binding.support.strings.NativeString;
 
 import java.nio.ByteBuffer;
 import java.util.List;
@@ -201,7 +201,7 @@ public void log(Pointer data, int level, libvlc_log_t ctx, String format, Pointe
     private String getString(PointerByReference pointer) {
         // The string is copied but not freed, the native string will be reclaimed when the native callback returns
         Pointer value = pointer.getValue();
-        return value != null ? NativeString.copyNativeString(value) : null;
+        return value != null ? VideoLan4J.copyNativeString(value) : null;
     }
 
     /**

diff --git a/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/InfoApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/InfoApi.java
@@ -19,9 +19,9 @@
 
 package uk.co.caprica.vlcj.media;
 
+import uk.co.caprica.vlcj.VideoLan4J;
 import uk.co.caprica.vlcj.binding.internal.libvlc_media_stats_t;
 import uk.co.caprica.vlcj.binding.lib.LibVlc;
-import uk.co.caprica.vlcj.binding.support.strings.NativeString;
 import uk.co.caprica.vlcj.player.base.State;
 
 import java.util.List;
@@ -44,7 +44,7 @@ public final class InfoApi extends BaseApi {
      * @return media resource locator
      */
     public String mrl() {
-        return NativeString.copyAndFreeNativeString(LibVlc.libvlc_media_get_mrl(mediaInstance));
+        return VideoLan4J.copyAndFreeNativeString(LibVlc.libvlc_media_get_mrl(mediaInstance));
     }
 
     /**