repackaged

olir · Mar 29, 2018 · 66151e9 · 66151e9
1 parent df6a2a2
commit 66151e9
Show file tree

Hide file tree

Showing 29 changed files with 47 additions and 101 deletions.
diff --git a/app/src/main/java/de/serviceflow/frankenstein/fxml/FxMain.java b/app/src/main/java/de/serviceflow/frankenstein/fxml/FxMain.java
@@ -34,17 +34,13 @@
 import de.serviceflow.frankenstein.plugin.api.NativeSegmentFilter;
 import de.serviceflow.frankenstein.plugin.api.SegmentVideoFilter;
 import de.serviceflow.frankenstein.vf.segment.BWFilter;
-import de.serviceflow.frankenstein.vf.segment.GLExampleFilter;
-import de.serviceflow.frankenstein.vf.segment.NativeExampleFilter;
 import de.serviceflow.frankenstein.vf.segment.StereoDistanceFilter;
-import de.serviceflow.frankenstein.vf.segment.VideoEqualizerFilter;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
-import samplefilters.SampleFilter;
 
 public class FxMain extends Application implements ConfigManager {
 
@@ -92,8 +88,8 @@ public void start(Stage primaryStage) {
 						(Object[]) null);
 				// nu.pattern.OpenCV.loadShared();
 				// nu.pattern.OpenCV.loadLocal();
-        System.out.println("Loading from " + System.getProperty("java.library.path"));
-        System.loadLibrary(org.opencv.core.Core.NATIVE_LIBRARY_NAME);
+				System.out.println("Loading from " + System.getProperty("java.library.path"));
+				System.loadLibrary(org.opencv.core.Core.NATIVE_LIBRARY_NAME);
 			} catch (ClassNotFoundException e) {
 				System.out.println("WARNING: nu.pattern.OpenCV not found.");
 			} catch (Throwable t) {
@@ -210,30 +206,22 @@ public void createSegmentFilters() {
 		try {
 			segmentFilters.add(new BWFilter());
 			segmentFilters.add(new StereoDistanceFilter());
-			segmentFilters.add(new SampleFilter());
-			segmentFilters.add(new GLExampleFilter());
 		} catch (Throwable t) {
 			t.printStackTrace();
 		}
 
-		// Filters with native proxy in jar
-		try {
-			segmentFilters.add(new NativeExampleFilter()); // try to load from
-															// plugin jar
-			segmentFilters.add(new VideoEqualizerFilter()); // try to load from
-															// plugin jar
-		} catch (Throwable t) {
-			t.printStackTrace();
-		}
-/*
-		// Filters completly in jar
-		try {
-			segmentFilters
-					.add(loadExternalFilterInstance("de.serviceflow.frankenstein.vf.external.ExternalSampleFilter"));
-		} catch (Throwable t) {
-			t.printStackTrace();
-		}
-*/
+		/*
+		 * // Filters completly in jar try { segmentFilters
+		 * .add(loadExternalFilterInstance(
+		 * "de.serviceflow.frankenstein.plugin.opencv.NativeExampleFilter"));
+		 * segmentFilters .add(loadExternalFilterInstance(
+		 * "de.serviceflow.frankenstein.plugin.opencv.VideoEqualizerFilter"));
+		 * segmentFilters .add(loadExternalFilterInstance(
+		 * "de.serviceflow.frankenstein.plugin.opencv.ExternalSampleFilter"));
+		 * segmentFilters .add(loadExternalFilterInstance(
+		 * "de.serviceflow.frankenstein.plugin.jogamp.GLExampleFilter")); }
+		 * catch (Throwable t) { t.printStackTrace(); }
+		 */
 	}
 
 	private SegmentVideoFilter loadExternalFilterInstance(String filterClassName) {

diff --git a/app/src/main/java/samplefilters/SampleConfigController.java b/app/src/main/java/samplefilters/SampleConfigController.java
diff --git a/app/src/main/java/samplefilters/SampleFilter.java b/app/src/main/java/samplefilters/SampleFilter.java
diff --git a/plugin-jogamp/java/pom.xml b/plugin-jogamp/java/pom.xml
@@ -55,13 +55,15 @@
    <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.7.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.8</source>
+          <target>1.8</target>
+          <encoding>UTF-8</encoding><!-- try to force encoding -->
         </configuration>
-      </plugin> 
+      </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/...vf/segment/GLExampleConfigController.java → ...gin/jogamp/GLExampleConfigController.java b/...vf/segment/GLExampleConfigController.java → ...gin/jogamp/GLExampleConfigController.java
@@ -1,4 +1,4 @@
-package de.serviceflow.frankenstein.vf.segment;
+package de.serviceflow.frankenstein.plugin.jogamp;
 
 import de.serviceflow.frankenstein.plugin.api.SegmentConfigController;
 

diff --git a/...nkenstein/vf/segment/GLExampleFilter.java → ...nstein/plugin/jogamp/GLExampleFilter.java b/...nkenstein/vf/segment/GLExampleFilter.java → ...nstein/plugin/jogamp/GLExampleFilter.java
@@ -1,4 +1,4 @@
-package de.serviceflow.frankenstein.vf.segment;
+package de.serviceflow.frankenstein.plugin.jogamp;
 
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;

diff --git a/...ow/frankenstein/vf/segment/glexample.fxml → ...frankenstein/plugin/jogamp/glexample.fxml b/...ow/frankenstein/vf/segment/glexample.fxml → ...frankenstein/plugin/jogamp/glexample.fxml
diff --git a/...nkenstein/vf/segment/glexample.properties → ...nstein/plugin/jogamp/glexample.properties b/...nkenstein/vf/segment/glexample.properties → ...nstein/plugin/jogamp/glexample.properties
diff --git a/...ogamp/java/src/main/resources/de/serviceflow/frankenstein/vf/external/externalsample.fxml b/...ogamp/java/src/main/resources/de/serviceflow/frankenstein/vf/external/externalsample.fxml
diff --git a/...java/src/main/resources/de/serviceflow/frankenstein/vf/external/externalsample.properties b/...java/src/main/resources/de/serviceflow/frankenstein/vf/external/externalsample.properties
diff --git a/plugin-opencv/java/pom.xml b/plugin-opencv/java/pom.xml
@@ -45,13 +45,15 @@
    <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.7.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.8</source>
+          <target>1.8</target>
+          <encoding>UTF-8</encoding><!-- try to force encoding -->
         </configuration>
-      </plugin> 
+      </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/...ernal/ExternalSampleConfigController.java → ...pencv/ExternalSampleConfigController.java b/...ernal/ExternalSampleConfigController.java → ...pencv/ExternalSampleConfigController.java
@@ -1,4 +1,4 @@
-package de.serviceflow.frankenstein.vf.external;
+package de.serviceflow.frankenstein.plugin.opencv;
 
 import de.serviceflow.frankenstein.plugin.api.SegmentConfigController;
 

diff --git a/...ein/vf/external/ExternalSampleFilter.java → ...n/plugin/opencv/ExternalSampleFilter.java b/...ein/vf/external/ExternalSampleFilter.java → ...n/plugin/opencv/ExternalSampleFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.serviceflow.frankenstein.vf.external;
+package de.serviceflow.frankenstein.plugin.opencv;
 
 import java.lang.reflect.Method;
 

diff --git a/...egment/NativeExampleConfigController.java → ...opencv/NativeExampleConfigController.java b/...egment/NativeExampleConfigController.java → ...opencv/NativeExampleConfigController.java
@@ -1,4 +1,4 @@
-package de.serviceflow.frankenstein.vf.segment;
+package de.serviceflow.frankenstein.plugin.opencv;
 
 import de.serviceflow.frankenstein.plugin.api.SegmentConfigController;
 

diff --git a/...stein/vf/segment/NativeExampleFilter.java → ...in/plugin/opencv/NativeExampleFilter.java b/...stein/vf/segment/NativeExampleFilter.java → ...in/plugin/opencv/NativeExampleFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.serviceflow.frankenstein.vf.segment;
+package de.serviceflow.frankenstein.plugin.opencv;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

diff --git a/...gment/VideoEqualizerConfigController.java → ...pencv/VideoEqualizerConfigController.java b/...gment/VideoEqualizerConfigController.java → ...pencv/VideoEqualizerConfigController.java
@@ -1,4 +1,4 @@
-package de.serviceflow.frankenstein.vf.segment;
+package de.serviceflow.frankenstein.plugin.opencv;
 
 import de.serviceflow.frankenstein.plugin.api.SegmentConfigController;
 import javafx.fxml.FXML;

diff --git a/...tein/vf/segment/VideoEqualizerFilter.java → ...n/plugin/opencv/VideoEqualizerFilter.java b/...tein/vf/segment/VideoEqualizerFilter.java → ...n/plugin/opencv/VideoEqualizerFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.serviceflow.frankenstein.vf.segment;
+package de.serviceflow.frankenstein.plugin.opencv;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

diff --git a/...nkenstein/vf/external/ExternalSample.java → ...ein/plugin/opencv/jni/ExternalSample.java b/...nkenstein/vf/external/ExternalSample.java → ...ein/plugin/opencv/jni/ExternalSample.java
@@ -1,4 +1,4 @@
-package de.serviceflow.frankenstein.vf.external;
+package de.serviceflow.frankenstein.plugin.opencv.jni;
 
 import de.serviceflow.frankenstein.plugin.api.NativeFilter;
 

diff --git a/...java/src/main/java/cc0/NativeExample.java → ...tein/plugin/opencv/jni/NativeExample.java b/...java/src/main/java/cc0/NativeExample.java → ...tein/plugin/opencv/jni/NativeExample.java
@@ -1,4 +1,4 @@
-package cc0;
+package de.serviceflow.frankenstein.plugin.opencv.jni;
 
 import de.serviceflow.frankenstein.plugin.api.NativeFilter;
 

diff --git a/...w/frankenstein/vf/jni/VideoEqualizer.java → ...ein/plugin/opencv/jni/VideoEqualizer.java b/...w/frankenstein/vf/jni/VideoEqualizer.java → ...ein/plugin/opencv/jni/VideoEqualizer.java
@@ -1,4 +1,4 @@
-package de.serviceflow.frankenstein.vf.jni;
+package de.serviceflow.frankenstein.plugin.opencv.jni;
 
 import de.serviceflow.frankenstein.plugin.api.NativeFilter;
 

diff --git a/...eflow/frankenstein/vf/segment/native.fxml → ...flow/frankenstein/vf/external/native.fxml b/...eflow/frankenstein/vf/segment/native.fxml → ...flow/frankenstein/vf/external/native.fxml
diff --git a/...frankenstein/vf/segment/native.properties → ...rankenstein/vf/external/native.properties b/...frankenstein/vf/segment/native.properties → ...rankenstein/vf/external/native.properties
diff --git a/...ankenstein/vf/segment/videoequalizer.fxml → ...nkenstein/vf/external/videoequalizer.fxml b/...ankenstein/vf/segment/videoequalizer.fxml → ...nkenstein/vf/external/videoequalizer.fxml
diff --git a/...tein/vf/segment/videoequalizer.properties → ...ein/vf/external/videoequalizer.properties b/...tein/vf/segment/videoequalizer.properties → ...ein/vf/external/videoequalizer.properties
diff --git a/plugin-opencv/native/src/main/native/ExternalSample.cpp b/plugin-opencv/native/src/main/native/ExternalSample.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 using namespace cv;
 
-JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_vf_external_ExternalSample_init
+JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_plugin_opencv_jni_ExternalSample_init
   (JNIEnv* env, jobject obj)
 {
   JwMat* mat = JwMat::matptr;
@@ -21,7 +21,7 @@ JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_vf_external_ExternalSamp
   }
 }
 
-JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_vf_external_ExternalSample_process
+JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_plugin_opencv_jni_ExternalSample_process
   (JNIEnv* env, jobject obj,
    jobject matobj, jint frameId, jobject context)
 {

diff --git a/plugin-opencv/native/src/main/native/NativeExample.cpp b/plugin-opencv/native/src/main/native/NativeExample.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 using namespace cv;
 
-JNIEXPORT void JNICALL Java_cc0_NativeExample_init
+JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_plugin_opencv_jni_NativeExample_init
   (JNIEnv* env, jobject obj)
 {
   JwMat* mat = JwMat::matptr;
@@ -24,7 +24,7 @@ JNIEXPORT void JNICALL Java_cc0_NativeExample_init
   cout << "Java_cc0_NativeExample_init END" << endl;
 }
 
-JNIEXPORT void JNICALL Java_cc0_NativeExample_process
+JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_plugin_opencv_jni_NativeExample_process
   (JNIEnv* env, jobject obj,
    jobject matobj, jint frameId, jobject context)
 {

diff --git a/plugin-opencv/native/src/main/native/VideoEqualizer.cpp b/plugin-opencv/native/src/main/native/VideoEqualizer.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 using namespace cv;
 
-JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_vf_jni_VideoEqualizer_init
+JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_plugin_opencv_jni_VideoEqualizer_init
   (JNIEnv* env, jobject obj)
 {
   JwMat* mat = JwMat::matptr;
@@ -21,7 +21,7 @@ JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_vf_jni_VideoEqualizer_in
   }
 }
 
-JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_vf_jni_VideoEqualizer_process
+JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_plugin_opencv_jni_VideoEqualizer_process
   (JNIEnv* env, jobject obj,
    jobject matobj, jint frameId, jobject context, jint brightness, jint contrast, jint saturation)
 {

diff --git a/plugin-opencv/native/win32/pom.xml b/plugin-opencv/native/win32/pom.xml
@@ -98,9 +98,9 @@
 					<javahOutputFileName>nativeCode.h</javahOutputFileName>
 					<javahClassNames>
 					  <javahClassName>cc0.JniTest</javahClassName>
-					  <javahClassName>cc0.NativeExample</javahClassName>
-					  <javahClassName>de.serviceflow.frankenstein.vf.jni.VideoEqualizer</javahClassName>
-					  <javahClassName>de.serviceflow.frankenstein.vf.external.ExternalSample</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>
 					</javahClassNames>
 				   </configuration>
 				   <goals>

diff --git a/plugin-opencv/native/win64/pom.xml b/plugin-opencv/native/win64/pom.xml
@@ -70,9 +70,9 @@
 					<javahOutputFileName>nativeCode.h</javahOutputFileName>
 					<javahClassNames>
 					  <javahClassName>cc0.JniTest</javahClassName>
-					  <javahClassName>cc0.NativeExample</javahClassName>
-					  <javahClassName>de.serviceflow.frankenstein.vf.jni.VideoEqualizer</javahClassName>
-					  <javahClassName>de.serviceflow.frankenstein.vf.external.ExternalSample</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>
 					</javahClassNames>
 				   </configuration>
 				   <goals>