plugin loading

app/src/main/java/de/serviceflow/frankenstein/fxml/FxMain.java

@@ -264,11 +264,11 @@ private SegmentVideoFilter loadExternalFilterInstance(String filterClassName, St
 			URLClassLoader childLoader = getLoader(ref);
 			Class filterClass = Class.forName(filterClassName, true, childLoader);
 			SegmentVideoFilter filter = (SegmentVideoFilter) filterClass.newInstance();
-			Method filterInitMethod = filterClass.getMethod("init");
-			filterInitMethod.invoke(filter);
+//			Method filterInitMethod = filterClass.getMethod("init");
+//			filterInitMethod.invoke(filter);
 			return filter;
-		} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException
-				| SecurityException | IllegalArgumentException | InvocationTargetException | MalformedURLException e) {
+		} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | MalformedURLException
+				| SecurityException | IllegalArgumentException /* | InvocationTargetException | NoSuchMethodException */ e) {
 			throw new RuntimeException(
 					"Failed loading filter " + filterClassName + " from " + ref,
 					e);

plugin-api/src/main/java/de/serviceflow/frankenstein/plugin/api/NativeFilter.java

@@ -16,18 +16,18 @@ public abstract class NativeFilter {
   private static UnsatisfiedLinkError error = null;
   private static final Set<String> loadedLibraries = Collections.synchronizedSet(new HashSet<String>());
 
-  public static void loadLibrary(Class invokerClass) throws UnsatisfiedLinkError {
+  public static void prepareLoadLibrary(NativeFilter invoker) throws UnsatisfiedLinkError {
     if (!loaderCalled) {
       loaderCalled = true;
       System.out.println("Working Directory = " + new File(".").getAbsolutePath());
       try {
         if (System.getProperty("os.arch").contains("64")
             && System.getProperty("sun.arch.data.model").contains("64")) {
           // load 64-bit lib
-          loadLibrary(invokerClass, "jniplugin-64");
+        	prepareLoadLibrary(invoker, "jniplugin-64");
         } else {
           // load 32-bit lib
-          loadLibrary(invokerClass, "jniplugin-32");
+        	prepareLoadLibrary(invoker, "jniplugin-32");
         }
       } catch (UnsatisfiedLinkError t) {
         System.out.println("sun.arch.data.model=" + System.getProperty("sun.arch.data.model"));
@@ -41,14 +41,14 @@ public static void loadLibrary(Class invokerClass) throws UnsatisfiedLinkError {
     }
   }
 
-  private static void loadLibrary(Class invokerClass, String libraryName) throws UnsatisfiedLinkError {
+  private static void prepareLoadLibrary(NativeFilter invoker, String libraryName) throws UnsatisfiedLinkError {
     synchronized (loadedLibraries) {
 
       if (loadedLibraries.contains(libraryName.intern()))
         return;
 
       try {
-        System.loadLibrary(libraryName);
+    	  invoker.loadLibrary(libraryName);
       } catch (final UnsatisfiedLinkError e) {
         if (!String.format("no %s in java.library.path", libraryName).equals(e.getMessage())) {
           System.out.println(
@@ -58,7 +58,7 @@ private static void loadLibrary(Class invokerClass, String libraryName) throws U
 
         String libFileName = libraryName + ".dll";
         String location = "/" + libFileName;
-        InputStream binary = invokerClass.getResourceAsStream("/" + libFileName);
+        InputStream binary = invoker.getClass().getResourceAsStream("/" + libFileName);
         if (binary == null)
           throw new Error("binary not found: " + "/" + libFileName);
 
@@ -90,8 +90,7 @@ private static void loadLibrary(Class invokerClass, String libraryName) throws U
           }
 
           try {
-        	//System.load(destination.normalize().toString());
-            System.loadLibrary(libraryName);
+        	  invoker.loadLibrary(libraryName);
           } catch (UnsatisfiedLinkError x) {
               System.out.println("!!! [1] UnsatisfiedLinkError: "+e.getMessage()+". But found binary in classpath -> Relocated to "+destination);
               System.out.println(
@@ -109,7 +108,8 @@ private static void loadLibrary(Class invokerClass, String libraryName) throws U
   }
 
   protected NativeFilter() throws UnsatisfiedLinkError {
-    loadLibrary(this.getClass());
+    prepareLoadLibrary(this);
   }
 
+  protected abstract void loadLibrary(String name);
 }

plugin-jogamp/java/src/main/java/de/serviceflow/frankenstein/plugin/jogamp/jni/MatBlender.java

@@ -6,6 +6,10 @@ public class MatBlender extends NativeFilter {
 	public MatBlender() throws UnsatisfiedLinkError {
 	}
 
+  protected void loadLibrary(String name) {
+    System.loadLibrary(name);
+  }
+
 	public native void init();
 	public native void process(Object mat, int frameId, Object context, Object overlay);
 }

plugin-opencv/java/src/main/java/de/serviceflow/frankenstein/plugin/opencv/jni/ExternalSample.java

@@ -5,7 +5,11 @@
 public class ExternalSample extends NativeFilter {
 	public ExternalSample() throws UnsatisfiedLinkError {
 	}
-
+
+  protected void loadLibrary(String name) {
+    System.loadLibrary(name);
+  }
+
 	public native void init();
 	public native void process(Object mat, int frameId, Object context);
 }

plugin-opencv/java/src/main/java/de/serviceflow/frankenstein/plugin/opencv/jni/NativeExample.java

@@ -5,7 +5,11 @@
 public class NativeExample extends NativeFilter {
 	public NativeExample() throws UnsatisfiedLinkError {
 	}
-
+
+  protected void loadLibrary(String name) {
+    System.loadLibrary(name);
+  }
+
 	public native void init();
 	public native void process(Object mat, int frameId, Object context);
 }

plugin-opencv/java/src/main/java/de/serviceflow/frankenstein/plugin/opencv/jni/VideoEqualizer.java

@@ -6,6 +6,10 @@ public class VideoEqualizer extends NativeFilter {
 	public VideoEqualizer() throws UnsatisfiedLinkError {
 	}
 
+  protected void loadLibrary(String name) {
+    System.loadLibrary(name);
+  }
+
 	public native void init();
 	public native void process(Object mat, int frameId, Object context, int brightness, int contrast, int saturation);
 }

plugin-opencv/native/win32/pom.xml

@@ -97,7 +97,6 @@
 					<workingDirectory>${basedir}</workingDirectory>
 					<javahOutputFileName>nativeCode.h</javahOutputFileName>
 					<javahClassNames>
-					  <javahClassName>cc0.JniTest</javahClassName>
 					  <javahClassName>de.serviceflow.frankenstein.plugin.opencv.jni.NativeExample</javahClassName>
 					  <javahClassName>de.serviceflow.frankenstein.plugin.opencv.jni.VideoEqualizer</javahClassName>
 					  <javahClassName>de.serviceflow.frankenstein.plugin.opencv.jni.ExternalSample</javahClassName>

plugin-opencv/native/win64/pom.xml

@@ -79,7 +79,6 @@
                 <workingDirectory>${basedir}</workingDirectory>
                 <javahOutputFileName>nativeCode.h</javahOutputFileName>
                 <javahClassNames>
-                  <javahClassName>cc0.JniTest</javahClassName>
                   <javahClassName>de.serviceflow.frankenstein.plugin.opencv.jni.NativeExample</javahClassName>
                   <javahClassName>de.serviceflow.frankenstein.plugin.opencv.jni.VideoEqualizer</javahClassName>
                   <javahClassName>de.serviceflow.frankenstein.plugin.opencv.jni.ExternalSample</javahClassName>