Ensure native libraries are loaded properly if running on OSGi

System.loadLibrary works properly in a real OSGi context in combination with Bundle-NativeCode manifest headers. The hacky JNIUtils with reflection and absolute paths is broken on newer Java versions unless add-opens is added. We don't need that.
jitsi · Jun 11, 2022 · de8f41c · de8f41c
1 parent 70dbb5c
commit de8f41c
Show file tree

Hide file tree

Showing 19 changed files with 47 additions and 187 deletions.
diff --git a/src/main/java/org/jitsi/impl/neomedia/MediaUtils.java b/src/main/java/org/jitsi/impl/neomedia/MediaUtils.java
@@ -105,25 +105,6 @@ public class MediaUtils
             AudioFormat.ULAW_RTP,
             8000);
 
-        /*
-         * Some codecs depend on JMF native libraries which are only available
-         * on 32-bit Linux and 32-bit Windows.
-         */
-        if (OSUtils.IS_LINUX32 || OSUtils.IS_WINDOWS32)
-        {
-            Map<String, String> g723FormatParams = new HashMap<>();
-            g723FormatParams.put("annexa", "no");
-            g723FormatParams.put("bitrate", "6.3");
-            addMediaFormats(
-                    (byte) SdpConstants.G723,
-                    "G723",
-                    MediaType.AUDIO,
-                    AudioFormat.G723_RTP,
-                    g723FormatParams,
-                    null,
-                    8000);
-        }
-
         addMediaFormats(
             (byte) SdpConstants.GSM,
             "GSM",
@@ -1041,10 +1022,6 @@ else if (jmfEncoding.equals(AudioFormat.GSM))
         {
             return SdpConstants.GSM;
         }
-        else if (jmfEncoding.equals(AudioFormat.GSM_RTP))
-        {
-            return SdpConstants.GSM;
-        }
         else if (jmfEncoding.equals(AudioFormat.G728_RTP))
         {
             return SdpConstants.G728;

diff --git a/src/main/java/org/jitsi/impl/neomedia/codec/audio/opus/Opus.java b/src/main/java/org/jitsi/impl/neomedia/codec/audio/opus/Opus.java
@@ -15,7 +15,7 @@
  */
 package org.jitsi.impl.neomedia.codec.audio.opus;
 
-import org.jitsi.utils.*;
+import org.jitsi.util.*;
 
 /**
  * Defines the API of the native opus library to be utilized by the libjitsi
@@ -78,7 +78,7 @@ public class Opus
      */
     static
     {
-        JNIUtils.loadLibrary("jnopus", Opus.class);
+        OSUtils.loadLibrary("jnopus", Opus.class);
     }
 
     /**

diff --git a/src/main/java/org/jitsi/impl/neomedia/codec/audio/speex/Speex.java b/src/main/java/org/jitsi/impl/neomedia/codec/audio/speex/Speex.java
@@ -15,7 +15,7 @@
  */
 package org.jitsi.impl.neomedia.codec.audio.speex;
 
-import org.jitsi.utils.*;
+import org.jitsi.util.*;
 
 /**
  * Provides the interface to the native Speex library.
@@ -42,7 +42,7 @@ public final class Speex
 
     static
     {
-        JNIUtils.loadLibrary("jnspeex", Speex.class);
+        OSUtils.loadLibrary("jnspeex", Speex.class);
     }
 
     public static void assertSpeexIsFunctional()

diff --git a/src/main/java/org/jitsi/impl/neomedia/codec/video/VPX.java b/src/main/java/org/jitsi/impl/neomedia/codec/video/VPX.java
@@ -15,7 +15,7 @@
  */
 package org.jitsi.impl.neomedia.codec.video;
 
-import org.jitsi.utils.*;
+import org.jitsi.util.*;
 
 /**
  * A wrapper for the libvpx native library.
@@ -902,7 +902,7 @@ public static String codec_err_to_string(int err)
 
     static
     {
-        JNIUtils.loadLibrary("jnvpx", VPX.class);
+        OSUtils.loadLibrary("jnvpx", VPX.class);
     }
 
     /**

diff --git a/src/main/java/org/jitsi/impl/neomedia/device/CoreAudioDevice.java b/src/main/java/org/jitsi/impl/neomedia/device/CoreAudioDevice.java
@@ -61,7 +61,7 @@ else if (OSUtils.IS_WINDOWS)
             }
             if (libname != null)
             {
-                JNIUtils.loadLibrary(libname, CoreAudioDevice.class);
+                OSUtils.loadLibrary(libname, CoreAudioDevice.class);
                 isLoaded = true;
             }
         }

diff --git a/src/main/java/org/jitsi/impl/neomedia/device/DeviceConfiguration.java b/src/main/java/org/jitsi/impl/neomedia/device/DeviceConfiguration.java
@@ -238,52 +238,6 @@ private static void fixRenderers()
         PlugInManager.removePlugIn(
                 "com.sun.media.renderer.audio.JavaSoundRenderer",
                 PlugInManager.RENDERER);
-
-        if (OSUtils.IS_WINDOWS)
-        {
-            if (OSUtils.IS_WINDOWS32)
-            {
-                /*
-                 * DDRenderer will cause 32-bit Windows Vista/7 to switch its
-                 * theme from Aero to Vista Basic so try to pick up a different
-                 * Renderer.
-                 */
-                if (renderers.contains(
-                        "com.sun.media.renderer.video.GDIRenderer"))
-                {
-                    PlugInManager.removePlugIn(
-                            "com.sun.media.renderer.video.DDRenderer",
-                            PlugInManager.RENDERER);
-                }
-            }
-            else if (OSUtils.IS_WINDOWS64)
-            {
-                /*
-                 * Remove the native Renderers for 64-bit Windows because native
-                 * JMF libs are not available for 64-bit machines.
-                 */
-                PlugInManager.removePlugIn(
-                        "com.sun.media.renderer.video.GDIRenderer",
-                        PlugInManager.RENDERER);
-                PlugInManager.removePlugIn(
-                        "com.sun.media.renderer.video.DDRenderer",
-                        PlugInManager.RENDERER);
-            }
-        }
-        else if (!OSUtils.IS_LINUX32)
-        {
-            if (renderers.contains(
-                        "com.sun.media.renderer.video.LightWeightRenderer")
-                    || renderers.contains(
-                            "com.sun.media.renderer.video.AWTRenderer"))
-            {
-                // Remove XLibRenderer because it is native and JMF is supported
-                // on 32-bit machines only.
-                PlugInManager.removePlugIn(
-                        "com.sun.media.renderer.video.XLibRenderer",
-                        PlugInManager.RENDERER);
-            }
-        }
     }
 
     /**

diff --git a/src/main/java/org/jitsi/impl/neomedia/imgstreaming/ScreenCapture.java b/src/main/java/org/jitsi/impl/neomedia/imgstreaming/ScreenCapture.java
@@ -15,7 +15,7 @@
  */
 package org.jitsi.impl.neomedia.imgstreaming;
 
-import org.jitsi.utils.*;
+import org.jitsi.util.*;
 import org.jitsi.utils.logging.*;
 
 /**
@@ -36,7 +36,7 @@ public class ScreenCapture
 
         try
         {
-            JNIUtils.loadLibrary(lib, ScreenCapture.class);
+            OSUtils.loadLibrary(lib, ScreenCapture.class);
         }
         catch (Throwable t)
         {

diff --git a/src/main/java/org/jitsi/impl/neomedia/jmfext/media/protocol/directshow/DSFormat.java b/src/main/java/org/jitsi/impl/neomedia/jmfext/media/protocol/directshow/DSFormat.java
@@ -16,7 +16,7 @@
 package org.jitsi.impl.neomedia.jmfext.media.protocol.directshow;
 
 import javax.media.*;
-import org.jitsi.utils.*;
+import org.jitsi.util.*;
 
 /**
  * DirectShow video format.
@@ -79,7 +79,7 @@ public class DSFormat
 
     static
     {
-        JNIUtils.loadLibrary("jndirectshow", DSFormat.class);
+        OSUtils.loadLibrary("jndirectshow", DSFormat.class);
 
         ARGB32 = ARGB32();
         I420 = I420();

diff --git a/src/main/java/org/jitsi/impl/neomedia/jmfext/media/protocol/directshow/DSManager.java b/src/main/java/org/jitsi/impl/neomedia/jmfext/media/protocol/directshow/DSManager.java
@@ -15,7 +15,7 @@
  */
 package org.jitsi.impl.neomedia.jmfext.media.protocol.directshow;
 
-import org.jitsi.utils.*;
+import org.jitsi.util.*;
 
 /**
  * DirectShow capture device manager.
@@ -44,7 +44,7 @@ public class DSManager
 
     static
     {
-        JNIUtils.loadLibrary("jndirectshow", DSManager.class);
+        OSUtils.loadLibrary("jndirectshow", DSManager.class);
     }
 
     /**

diff --git a/src/main/java/org/jitsi/impl/neomedia/jmfext/media/protocol/video4linux2/Video4Linux2.java b/src/main/java/org/jitsi/impl/neomedia/jmfext/media/protocol/video4linux2/Video4Linux2.java
@@ -15,7 +15,7 @@
  */
 package org.jitsi.impl.neomedia.jmfext.media.protocol.video4linux2;
 
-import org.jitsi.utils.*;
+import org.jitsi.util.*;
 
 /**
  * Provides the interface to the native Video for Linux Two API Specification
@@ -95,7 +95,7 @@ public class Video4Linux2
 
     static
     {
-        JNIUtils.loadLibrary("jnvideo4linux2", Video4Linux2.class);
+        OSUtils.loadLibrary("jnvideo4linux2", Video4Linux2.class);
 
         VIDIOC_DQBUF = VIDIOC_DQBUF();
         VIDIOC_G_FMT = VIDIOC_G_FMT();

diff --git a/src/main/java/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/WASAPI.java b/src/main/java/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/WASAPI.java
@@ -15,7 +15,7 @@
  */
 package org.jitsi.impl.neomedia.jmfext.media.protocol.wasapi;
 
-import org.jitsi.utils.*;
+import org.jitsi.util.*;
 import org.jitsi.utils.logging.*;
 
 /**
@@ -122,7 +122,7 @@ public class WASAPI
 
     static
     {
-        JNIUtils.loadLibrary("jnwasapi", WASAPI.class);
+        OSUtils.loadLibrary("jnwasapi", WASAPI.class);
 
         AUDCLNT_E_NOT_STOPPED
             = MAKE_HRESULT(SEVERITY_ERROR, FACILIY_AUDCLNT, 5);

diff --git a/src/main/java/org/jitsi/impl/neomedia/jmfext/media/renderer/video/JAWTRenderer.java b/src/main/java/org/jitsi/impl/neomedia/jmfext/media/renderer/video/JAWTRenderer.java
@@ -26,7 +26,6 @@
 import org.jitsi.impl.neomedia.codec.video.*;
 import org.jitsi.impl.neomedia.jmfext.media.renderer.*;
 import org.jitsi.util.OSUtils;
-import org.jitsi.utils.*;
 import org.jitsi.util.swing.*;
 import org.jitsi.utils.logging.*;
 
@@ -98,7 +97,7 @@ public class JAWTRenderer
 
     static
     {
-        JNIUtils.loadLibrary("jnawtrenderer", JAWTRenderer.class);
+        OSUtils.loadLibrary("jnawtrenderer", JAWTRenderer.class);
     }
 
     static native void addNotify(long handle, Component component);

diff --git a/src/main/java/org/jitsi/impl/neomedia/portaudio/Pa.java b/src/main/java/org/jitsi/impl/neomedia/portaudio/Pa.java
@@ -21,7 +21,6 @@
 import org.jitsi.service.configuration.*;
 import org.jitsi.service.libjitsi.*;
 import org.jitsi.util.OSUtils;
-import org.jitsi.utils.*;
 import org.jitsi.utils.logging.*;
 
 /**
@@ -246,7 +245,7 @@ public String getApiName()
 
     static
     {
-        JNIUtils.loadLibrary("jnportaudio", Pa.class);
+        OSUtils.loadLibrary("jnportaudio", Pa.class);
 
         try
         {

diff --git a/src/main/java/org/jitsi/impl/neomedia/pulseaudio/PA.java b/src/main/java/org/jitsi/impl/neomedia/pulseaudio/PA.java
@@ -15,7 +15,7 @@
  */
 package org.jitsi.impl.neomedia.pulseaudio;
 
-import org.jitsi.utils.*;
+import org.jitsi.util.*;
 
 /**
  * Declares the functions, structures and constants of the native
@@ -122,7 +122,7 @@ public interface stream_success_cb_t
 
     static
     {
-        JNIUtils.loadLibrary("jnpulseaudio", PA.class);
+        OSUtils.loadLibrary("jnpulseaudio", PA.class);
     }
 
     public static native void buffer_attr_free(long attr);

diff --git a/src/main/java/org/jitsi/impl/neomedia/quicktime/CVImageBuffer.java b/src/main/java/org/jitsi/impl/neomedia/quicktime/CVImageBuffer.java
@@ -15,7 +15,7 @@
  */
 package org.jitsi.impl.neomedia.quicktime;
 
-import org.jitsi.utils.*;
+import org.jitsi.util.*;
 
 /**
  * Represents a CoreVideo <tt>CVImageBufferRef</tt>.
@@ -26,7 +26,7 @@ public class CVImageBuffer
 {
     static
     {
-        JNIUtils.loadLibrary("jnquicktime", CVImageBuffer.class);
+        OSUtils.loadLibrary("jnquicktime", CVImageBuffer.class);
     }
 
     /**

diff --git a/src/main/java/org/jitsi/impl/neomedia/quicktime/CVPixelBufferAttributeKey.java b/src/main/java/org/jitsi/impl/neomedia/quicktime/CVPixelBufferAttributeKey.java
@@ -15,7 +15,7 @@
  */
 package org.jitsi.impl.neomedia.quicktime;
 
-import org.jitsi.utils.*;
+import org.jitsi.util.*;
 
 /**
  * @author Lyubomir Marinov
@@ -30,7 +30,7 @@ public final class CVPixelBufferAttributeKey
 
     static
     {
-        JNIUtils.loadLibrary("jnquicktime", CVPixelBufferAttributeKey.class);
+        OSUtils.loadLibrary("jnquicktime", CVPixelBufferAttributeKey.class);
 
         kCVPixelBufferHeightKey = kCVPixelBufferHeightKey();
         kCVPixelBufferPixelFormatTypeKey = kCVPixelBufferPixelFormatTypeKey();

diff --git a/src/main/java/org/jitsi/impl/neomedia/quicktime/NSObject.java b/src/main/java/org/jitsi/impl/neomedia/quicktime/NSObject.java
@@ -15,7 +15,7 @@
  */
 package org.jitsi.impl.neomedia.quicktime;
 
-import org.jitsi.utils.*;
+import org.jitsi.util.*;
 
 /**
  * Represents the root of most Objective-C class hierarchies which which objects
@@ -28,7 +28,7 @@ public class NSObject
 {
     static
     {
-        JNIUtils.loadLibrary("jnquicktime", NSObject.class);
+        OSUtils.loadLibrary("jnquicktime", NSObject.class);
     }
 
     /**

diff --git a/src/main/java/org/jitsi/impl/neomedia/recording/WebmWriter.java b/src/main/java/org/jitsi/impl/neomedia/recording/WebmWriter.java
@@ -16,13 +16,13 @@
 package org.jitsi.impl.neomedia.recording;
 
 import java.io.*;
-import org.jitsi.utils.*;
+import org.jitsi.util.*;
 
 public class WebmWriter
 {
     static
     {
-        JNIUtils.loadLibrary("jnvpx", WebmWriter.class);
+        OSUtils.loadLibrary("jnvpx", WebmWriter.class);
     }
 
     /**