Started on native Video-Equalizer Filter

.gitignore

@@ -3,6 +3,7 @@
 **/.settings/
 **/target/
 **/velocity.log
+**/*.log
 **/Thumbs.db
 **/*.dll
 **/.externalToolBuilders/

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

@@ -29,6 +29,7 @@
 import de.screenflow.frankenstein.vf.segment.BWFilter;
 import de.screenflow.frankenstein.vf.segment.NativeExampleFilter;
 import de.screenflow.frankenstein.vf.segment.StereoDistanceFilter;
+import de.screenflow.frankenstein.vf.segment.VideoEqualizerFilter;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
@@ -191,6 +192,7 @@ public void createSegmentFilters() {
 
 		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();

app/src/main/java/de/screenflow/frankenstein/vf/segment/NativeSegmentFilter.java

@@ -51,18 +51,16 @@ protected NativeSegmentFilter(String identifier, String proxyClassName) {
 
 		try {
 			// use dynamic loading and reflection when loading jni proxy class
-			// from jar, so app do
-			// not depend on it.
+			// from jar, so app do not depend on it.
 			URLClassLoader childLoader = getLoader();
 			jniProxyClass = Class.forName(proxyClassName, true, childLoader);
 			jniProxy = jniProxyClass.newInstance();
 			jniProxyInitMethod = jniProxyClass.getMethod("init");
 			jniProxyInitMethod.invoke(jniProxy);
 		} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException
 				| SecurityException | IllegalArgumentException | InvocationTargetException | MalformedURLException e) {
-			throw new RuntimeException("jni wrapper creation failed", e);
+			throw new RuntimeException("jni wrapper creation failed. Bug-Mining: Ensure the wrapper was added to the javahClassNames in pom.xml. Check NativeCode.h for existing and proper signatures.", e);
 		}
-
 	}
 
 	static synchronized URLClassLoader getLoader() throws MalformedURLException {

app/src/main/java/de/screenflow/frankenstein/vf/segment/VideoEqualizerConfigController.java

@@ -0,0 +1,5 @@
+package de.screenflow.frankenstein.vf.segment;
+
+public class VideoEqualizerConfigController {
+
+}

app/src/main/java/de/screenflow/frankenstein/vf/segment/VideoEqualizerFilter.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2017 Oliver Rode, https://github.com/olir/Frankenstein
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.screenflow.frankenstein.vf.segment;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.opencv.core.Mat;
+
+public class VideoEqualizerFilter extends NativeSegmentFilter<VideoEqualizerConfigController> {
+
+	private final static String JNI_FILTER_CLASS = "de.screenflow.frankenstein.vf.jni.VideoEqualizer";
+
+	private final Method jniProxyProcessMethod;
+
+	@SuppressWarnings("unchecked")
+	public VideoEqualizerFilter() throws UnsatisfiedLinkError {
+		super("videoequalizer", JNI_FILTER_CLASS);
+		try {
+			jniProxyProcessMethod = getJniProxyClass().getMethod("process", Object.class, int.class);
+		} catch (NoSuchMethodException | SecurityException | IllegalArgumentException e) {
+			throw new RuntimeException("jni wrapper creation failed", e);
+		}
+	}
+
+	@Override
+	public Mat process(Mat sourceFrame, int frameId) {
+		try {
+			jniProxyProcessMethod.invoke(getJniProxy(), sourceFrame, frameId);
+		} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+			e.printStackTrace();
+		}
+		return sourceFrame;
+	}
+
+	@Override
+	protected void initializeController() {
+		// getConfigController(). ...
+	}
+}

app/src/main/resources/de/screenflow/frankenstein/vf/segment/videoequalizer.fxml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.BorderPane?>
+
+<BorderPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.screenflow.frankenstein.vf.segment.VideoEqualizerConfigController">
+</BorderPane>

app/src/main/resources/de/screenflow/frankenstein/vf/segment/videoequalizer.properties

@@ -0,0 +1 @@
+name=Video-Equalizer

jniplugin/java/src/main/java/cc0/JniExample.java

@@ -1,8 +1,10 @@
 package cc0;
 
+import de.screenflow.frankenstein.vf.jni.NativeFilter;
+
 public class JniExample {
 	public JniExample() throws UnsatisfiedLinkError {
-    NativeFilter.loadLibrary();
+		NativeFilter.loadLibrary();
 	}
 
 	public static void main(String[] args) {

jniplugin/java/src/main/java/cc0/NativeExample.java

@@ -1,5 +1,7 @@
 package cc0;
 
+import de.screenflow.frankenstein.vf.jni.NativeFilter;
+
 public class NativeExample extends NativeFilter {
 	public NativeExample() throws UnsatisfiedLinkError {
 	}

jniplugin/java/src/main/java/cc0/NativeFilter.java → jniplugin/java/src/main/java/de/screenflow/frankenstein/vf/jni/NativeFilter.java

@@ -1,4 +1,4 @@
-package cc0;
+package de.screenflow.frankenstein.vf.jni;
 
 import java.io.File;
 import java.io.IOException;

jniplugin/java/src/main/java/de/screenflow/frankenstein/vf/jni/VideoEqualizer.java

@@ -0,0 +1,9 @@
+package de.screenflow.frankenstein.vf.jni;
+
+public class VideoEqualizer extends NativeFilter {
+	public VideoEqualizer() throws UnsatisfiedLinkError {
+	}
+
+	public native void init();
+	public native void process(Object mat, int frameId);
+}

jniplugin/native/include/JwMat.h

@@ -13,6 +13,7 @@ class JwMat                    // begin declaration of the class
     int channels(JNIEnv* env, jobject matobj);
     long dataAddr(JNIEnv* env, jobject matobj);
     long step1(JNIEnv* env, jobject matobj);
+    static JwMat* matptr;
  private:                      // begin private section
     jclass clsMat;
     jmethodID m_rows;

jniplugin/native/src/main/native/JwMat.cpp

@@ -5,6 +5,8 @@
 
 using namespace std;
 
+JwMat* JwMat::matptr = NULL;
+
 JwMat::JwMat(JNIEnv* env)
 {
 	cout << "JwMat() START" << endl;

jniplugin/native/src/main/native/NativeExample.cpp

@@ -12,15 +12,14 @@
 using namespace std;
 using namespace cv;
 
-JwMat* mat;
-
 JNIEXPORT void JNICALL Java_cc0_NativeExample_init
   (JNIEnv* env, jobject obj)
 {
+  JwMat* mat = JwMat::matptr;
   cout << "Java_cc0_NativeExample_init START" << endl;
   if (mat == NULL) {
 	 cout << "Java_cc0_NativeExample_init Mat-Wrapper created" << endl;
-	 mat = new JwMat(env);
+	 JwMat::matptr = new JwMat(env);
   }
   cout << "Java_cc0_NativeExample_init END" << endl;
 }
@@ -30,6 +29,7 @@ JNIEXPORT void JNICALL Java_cc0_NativeExample_process
    jobject matobj, jint frameId)
 {
   cout << "Java_cc0_NativeExample_process CALLED " << frameId << endl;
+  JwMat* mat = JwMat::matptr;
   int cols = mat->cols(env, matobj);
   int rows = mat->rows(env, matobj);
   cout << "rows=" << rows << ", cols=" << cols << endl;

jniplugin/native/src/main/native/VideoEqualizer.cpp

@@ -0,0 +1,46 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <iostream>
+
+#include "nativeCode.h" // generated by javah via maven-native-plugin
+
+#include "opencv2/core/core.hpp"
+#include "JwMat.h"
+#include "jni_helper.h"
+#include "cv_helper.h"
+
+using namespace std;
+using namespace cv;
+
+JNIEXPORT void JNICALL Java_de_screenflow_frankenstein_vf_jni_VideoEqualizer_init
+  (JNIEnv* env, jobject obj)
+{
+  JwMat* mat = JwMat::matptr;
+  if (mat == NULL) {
+	 JwMat::matptr = new JwMat(env);
+  }
+}
+
+JNIEXPORT void JNICALL Java_de_screenflow_frankenstein_vf_jni_VideoEqualizer_process
+  (JNIEnv* env, jobject obj,
+   jobject matobj, jint frameId)
+{
+  JwMat* mat = JwMat::matptr;
+  int cols = mat->cols(env, matobj);
+  int rows = mat->rows(env, matobj);
+  cout << "rows=" << rows << ", cols=" << cols << endl;
+
+  int channels = mat->channels(env, matobj);
+  if (channels<3) {
+	  J_THROW("java/lang/Error", "channels < 3: "+mat->channels(env, matobj));
+      return;
+  }
+
+  int c0 = (unsigned char)POINT_CHANNEL_VALUE((cols>>1),(rows>>1),0,mat);
+  int c1 = (unsigned char)POINT_CHANNEL_VALUE((cols>>1),(rows>>1),1,mat);
+  int c2 = (unsigned char)POINT_CHANNEL_VALUE((cols>>1),(rows>>1),2,mat);
+  cout << "RGB-values at " << (rows>>1) << "," << (cols>>1) << ": " <<
+		  c2 << "/" << c1 << "/" << c0 << endl ;
+
+}
+

jniplugin/native/win64/pom.xml

@@ -71,6 +71,7 @@
 					<javahClassNames>
 					  <javahClassName>cc0.JniExample</javahClassName>
 					  <javahClassName>cc0.NativeExample</javahClassName>
+					  <javahClassName>de.screenflow.frankenstein.vf.jni.VideoEqualizer</javahClassName>
 					</javahClassNames>
 				   </configuration>
 				   <goals>