Instrumented Test of OpenCV HAAR FD

Author: aloruss1

.gitignore

@@ -5,3 +5,8 @@ build/
 local.properties
 .DS_Store
 captures/
+./FaceTracker/app/build/intermediates/jniLibs/release/*
+./FaceTracker/openCVLibrary330/build/intermediates/jniLibs/release/*
+./FaceTracker/app/src/main/JniLibs/*
+*.so
+*.a

FaceTracker/app/build.gradle

@@ -20,29 +20,43 @@ android {
         externalNativeBuild {
             cmake {
                 cppFlags "-frtti -fexceptions"
-                //abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+                //
+                // abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a'
                 abiFilters 'armeabi-v7a'
                 arguments "-DANDROID_STL=gnustl_shared"
                 //arguments "-DANDROID_STL=c++_shared"
                 // AL:  arguments "-DANDROID_STL=c++_shared", "-DBUILD_opencv_apps:BOOL=ON", "-DBUILD_SHARED_LIBS:BOOL=ON"
                 // Passes optional arguments to CMake.
                 //arguments "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang"
-
-                // Sets a flag to enable format macro constants for the C compiler.
-                //cFlags "-D__STDC_FORMAT_MACROS"
             }
         }    
         signingConfig signingConfigs.config
+
+        // AL (
+        // Specifies the application ID for the test APK.
+        testApplicationId "org.opencv.android.facetracker"
+        // Specifies the fully-qualified class name of the test instrumentation runner.
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        // If set to 'true', enables the instrumentation class to start and stop profiling.
+        // If set to false (default), profiling occurs the entire time the instrumentation
+        // class is running.
+        // testHandleProfiling true
+        // If set to 'true', indicates that the Android system should run the instrumentation
+        // class as a functional test. The default value is 'false'
+        // testFunctionalTest true
+        // AL )
+
+
     }
 
+
 //    sourceSets { // AL: added
-//        main {
-//            jniLibs.srcDirs = ['src/main/jniLibs']
-//            jni.srcDirs = ['src/main/jni', 'src/main/jniLibs/']
-//            //jni.srcDirs = []
-//        }
-//    }
+//        main {jniLibs.srcDirs = ['src/main/jniLibs']
+//            jni.srcDirs = ['src/main/jni', 'src/main/jniLibs/']  //jni.srcDirs = []  } }
+
+//    allprojects { tasks.withType(JavaCompile) {
+//            options.compilerArgs << "-Xlint:deprecation" }}
+
 
     buildTypes {
         release {
@@ -69,12 +83,23 @@ android {
     lintOptions {
         abortOnError false
     }
+    sourceSets {
+        main { jniLibs.srcDirs = ['src/main/jniLibs'] }
+        androidTest {  // AL
+            java.srcDir file('src/androidTest/java')
+            resources.srcDir file('src/androidTest/assets')
+        }
+        //instrumentTest.setRoot('src/androidTest/')
+    }
+    configurations.all {
+        resolutionStrategy.force 'com.android.support:support-annotations:23.4.0'
+    }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:support-annotations:27.1.1'
+    implementation 'com.android.support:support-annotations:23.4.0'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
@@ -84,4 +109,5 @@ dependencies {
     implementation 'com.android.support:design:23.4.0'
     implementation 'com.google.android.gms:play-services-vision:9.4.0+'
     implementation 'com.shamanland:xdroid-toaster:0.2.4'
+    implementation project(':openCVLibrary330')
 }

FaceTracker/app/src/androidTest/java/com/google/android/gms/samples/vision/face/facetracker/ExampleInstrumentedTest.java

@@ -13,13 +13,13 @@
 
 @RunWith(AndroidJUnit4.class)
 public class ExampleInstrumentedTest {
+
     @Test
     public void useAppContext() throws Exception {
         Context appContext = InstrumentationRegistry.getTargetContext();
         assertEquals("com.google.android.gms.samples.vision.face.facetracker", appContext.getPackageName());
     }
 
-
     @Rule
     public ActivityTestRule<FaceTrackerActivity> activityRule = new ActivityTestRule(FaceTrackerActivity.class);
 

FaceTracker/app/src/androidTest/java/dlib/android/FaceRecognizerTest.java

@@ -12,15 +12,18 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import static org.junit.Assert.assertEquals;
+import static junit.framework.Assert.assertEquals;
+
 
 public class FaceRecognizerTest {
     private static final String TAG = "FaceRecognizerTest";
 
+
     @Test
     public void RecognizeTest() throws IOException {
         FaceRecognizer fr = new FaceRecognizer();
         fr.loadNative();
+
         Context testContext = InstrumentationRegistry.getInstrumentation().getContext();
         InputStream testInput = testContext.getAssets().open("11.png");
         Bitmap bitmap = BitmapFactory.decodeStream(testInput);

FaceTracker/app/src/androidTest/java/org/opencv/android/facetracker/HaarDetectorTest.java

@@ -0,0 +1,60 @@
+package org.opencv.android.facetracker;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.text.TextUtils;
+
+import org.opencv.android.Utils;
+import org.opencv.core.Mat;
+import org.opencv.core.MatOfRect;
+
+import java.io.IOException;
+import java.io.InputStream;
+import android.support.test.InstrumentationRegistry;
+import org.junit.Test;
+
+
+import static junit.framework.Assert.assertEquals;
+
+/**
+ * Created by alorusso on 07/06/18.
+ */
+
+public class HaarDetectorTest {
+        private static final String TAG = "FaceTrackerTest";
+    static {
+        System.loadLibrary("opencv_java3");
+    }
+
+        public HaarDetectorTest() {
+        }
+
+        @Test
+        public void OCVTrackerTest() throws IOException {
+
+            HaarDetector hd = new HaarDetector();
+            hd.loadNative();
+
+            Context testContext = InstrumentationRegistry.getInstrumentation().getContext();
+            InputStream testInput = testContext.getAssets().open("11.png");
+            Bitmap bitmap = BitmapFactory.decodeStream(testInput);
+
+            Mat matImg = new Mat();
+            MatOfRect rectList = new MatOfRect();
+
+            Utils.bitmapToMat(bitmap, matImg);
+
+            hd.OCvDetect(matImg.getNativeObjAddr(), rectList.getNativeObjAddr());
+
+            System.out.println("Number of faces = " + rectList.size());
+
+            //
+            //assertEquals("Number of faces %d", rectList.size());
+            //Rect[] faces = rects.toArray();
+            //
+            //for (int i=0; i<faces.length; i++)
+            //Imgproc.rectangle(bitmap, faces[i].tl(),faces[i].br(), Scalar(255,255,255,255),3)
+            //
+    }
+}

FaceTracker/app/src/main/cpp/OCV-native-lib.cpp

@@ -14,42 +14,78 @@
 using namespace std;
 using namespace cv;
 
-#define AppTag "OCV-FD::Activity"
+
+#define  LOG_TAG    "OCV-Native"
+#define  LOGI(...)  __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__)
+#define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
+
+
 
 extern "C"
 {
 
+/*
+inline void vector_Rect_to_Mat(vector<Rect>& v_rect, Mat& mat)
+{
+    mat = Mat(v_rect, true);
+}
+*/
 
-void detect(Mat &gray) {
+inline void vector_Rect_to_Mat(std::vector<Rect>& v_rect, Mat& mat)
+{
+    mat = Mat(v_rect, true);
+}
 
-    String face_cascade_name = "/sdcard/Download/haarcascade_frontalface_default.xml";
 
-    CascadeClassifier face_cascade;
-    std::vector<Rect> faces;
+CascadeClassifier face_cascade;
 
-    if( !face_cascade.load( face_cascade_name ) ){
-        printf("--(!)Error loading\n");
-        __android_log_print(ANDROID_LOG_DEBUG, AppTag, "Resources NOT found: exiting");
-        return;
-    }
+vector<Rect> detect(Mat &gray) {
 
-    face_cascade.detectMultiScale(gray,faces,1.1,3,0,Size(20,20),Size(1000,1000));
+    std::vector<Rect> faces = {};
+    face_cascade.detectMultiScale(gray, faces, 1.1, 3, 0, Size(20, 20), Size(1000, 1000));
 
-    for(size_t i=0; i<faces.size(); i++)
-    {
-        rectangle(gray,faces[i],cv::Scalar(255, 255, 255), 2, 8, 0);
+    /*
+    for (size_t i = 0; i < faces.size(); i++) {
+        rectangle(gray, faces[i], cv::Scalar(255, 255, 255), 2, 8, 0);
     }
+    */
+    return faces;
 }
 
 
-void JNICALL
-Java_ch_hepia_iti_opencvnativeandroidstudio_MainActivity_imgProcess(JNIEnv *env, jclass,
-                                                                    jlong inputAddrMat,
-                                                                    jlong imageAddrGray) {
-    Mat &mRgb = *(Mat *)inputAddrMat;
-    Mat &mGray = *(Mat *)imageAddrGray;
 
-    detect (mGray);
+JNIEXPORT void JNICALL
+Java_org_opencv_android_facetracker_HaarDetector_loadResources(
+        JNIEnv *env, jobject instance)
+{
+    String face_cascade_name = "/sdcard/Download/haarcascade_frontalface_default.xml";
+
+    if (!face_cascade.load(face_cascade_name)) {
+        LOGE("OCV resources NOT loaded");
+        return;
+    } else {
+        LOGI("OCV resources loaded");
+    }
 }
 
+
+JNIEXPORT void JNICALL
+Java_org_opencv_android_facetracker_HaarDetector_OpenCVdetector(JNIEnv *env, jclass instance,
+                                                                jlong inputAddrMat, jlong matRects) {
+
+    vector<Rect> faces;
+
+
+    Mat &origImg = *((Mat *)inputAddrMat);
+    Mat mGray;
+    cv::cvtColor(origImg, mGray, CV_BGR2GRAY);
+
+    faces = detect (mGray);
+    //faces = detect(origImg);
+
+    vector_Rect_to_Mat(faces, *((Mat*)matRects));
 }
+}
+
+// inline void Mat_to_vector_Rect (Mat &mat, vector <Rect> &v_rect);
+// ((Mat*)matRect) = Mat(faces, true);

FaceTracker/app/src/main/java/org/opencv/android/facetracker/HaarDetector.java

@@ -0,0 +1,32 @@
+package org.opencv.android.facetracker;
+
+import org.opencv.android.BaseLoaderCallback;
+import org.opencv.android.LoaderCallbackInterface;
+import org.opencv.android.OpenCVLoader;
+import android.util.Log;
+
+/**
+ * Created by alorusso on 06/06/18.
+ */
+
+public class HaarDetector {
+        private static final String TAG = "OCV-HaarDetector";
+
+
+        public HaarDetector() {
+            //System.loadLibrary("opencv_java3");
+        }
+
+        public void loadNative() {
+            System.loadLibrary("OCV-native-lib");
+
+            loadResources();
+        }
+
+        public void OCvDetect(long imageGray, long faces) {
+            OpenCVdetector(imageGray, faces);
+        }
+
+        private native void OpenCVdetector(long imageGray, long faces);
+        private native void loadResources();
+}

FaceTracker/app/src/main/java/org/opencv/android/facetracker/OpenCvActivity.java

@@ -1,18 +1,23 @@
 package org.opencv.android.facetracker;
 
+
 import android.content.Intent;
+
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 
+
 import com.google.android.gms.samples.vision.face.facetracker.FaceTrackerActivity;
 import com.google.android.gms.samples.vision.face.facetracker.R;
 
+
 public class OpenCvActivity extends AppCompatActivity {
     private static final String TAG = "OpenCvActivity";
     private Button mBtnDetect;
 
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -28,5 +33,4 @@ public void onClick(View v) {
             }
         });
     }
-
 }

FaceTracker/gradle.properties

@@ -11,7 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
+org.gradle.jvmargs=-Xmx2048m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

FaceTracker/settings.gradle

@@ -1 +1,2 @@
 include ':app'
+include ':openCVLibrary330'