refactor recognize methods

Author: vkocheryzhkin

visionSamples/FaceTracker/app/src/androidTest/assets/11.png

@@ -4,6 +4,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.support.test.InstrumentationRegistry;
+import android.text.TextUtils;
 import android.util.Log;
 
 import org.junit.Test;
@@ -21,10 +22,12 @@ public void RecognizeTest() throws IOException {
         FaceRecognizer fr = new FaceRecognizer();
         fr.loadNative();
         Context testContext = InstrumentationRegistry.getInstrumentation().getContext();
-        InputStream testInput = testContext.getAssets().open("2.bmp");
+        InputStream testInput = testContext.getAssets().open("11.png");
         Bitmap bitmap = BitmapFactory.decodeStream(testInput);
-        Log.i(TAG, String.format("test1: %d", bitmap.getAllocationByteCount()));
-        String res = fr.recognizeNative1(bitmap);
-        assertEquals("Unknown", res);
+
+        //Log.i(TAG, String.format("bitmap size: %d", bitmap.getAllocationByteCount()));
+        String[] res = fr.recognizeFaces(bitmap);
+
+        assertEquals("Unknown,Unknown,Unknown,Unknown,Unknown,Unknown,Unknown,Unknown,Unknown,Unknown,Unknown", TextUtils.join(",", res));
     }
 }

visionSamples/FaceTracker/app/src/androidTest/assets/2.bmp

@@ -201,10 +201,12 @@ Java_dlib_android_FaceRecognizer_loadResourcesPart2(JNIEnv *env, jobject instanc
     }
     return 0;
 }extern "C"
-JNIEXPORT jstring JNICALL
-Java_dlib_android_FaceRecognizer_recognizeNative1(JNIEnv *env,
+JNIEXPORT jobjectArray JNICALL
+Java_dlib_android_FaceRecognizer_recognizeFaces(JNIEnv *env,
                                                          jobject instance,
                                                          jobject bmp) {
+    jobjectArray strarr;
+    std::vector<string> names;
 
     AndroidBitmapInfo infocolor;
     void *pixelscolor;
@@ -214,14 +216,16 @@ Java_dlib_android_FaceRecognizer_recognizeNative1(JNIEnv *env,
     array2d<rgb_pixel> img;
     if ((ret = AndroidBitmap_getInfo(env, bmp, &infocolor)) < 0) {
         LOGE("AndroidBitmap_getInfo() failed ! error=%d", ret);
-        return env->NewStringUTF("Image broken");
+        //return env->NewStringUTF("Image broken");
+        return strarr;
     }
     LOGI("color image :: width is %d; height is %d; stride is %d; format is %d;flags is %d",
          infocolor.width, infocolor.height, infocolor.stride, infocolor.format, infocolor.flags);
 
     if (infocolor.format != ANDROID_BITMAP_FORMAT_RGBA_8888) {
         LOGE("Bitmap format is not RGBA_8888 !");
-        return env->NewStringUTF("Image broken 2");
+        //return env->NewStringUTF("Image broken 2");
+        return strarr;
     }
 
     if ((ret = AndroidBitmap_lockPixels(env, bmp, &pixelscolor)) < 0) {
@@ -240,15 +244,13 @@ Java_dlib_android_FaceRecognizer_recognizeNative1(JNIEnv *env,
         pixelscolor = (char *) pixelscolor + infocolor.stride;
     }
 
-    std::string returnValue = "Num Faces: ";
-
+    //dlib::save_bmp(img, "/sdcard/Download/tt.bmp");
     std::vector<dlib::rectangle> dets = detector1(img);
     if (dets.size() == 0){
-        std::string name = "Unknown";
-        return env->NewStringUTF(name.c_str());
+        return strarr;
     }
-    returnValue += std::to_string(dets.size());
-    returnValue += ". ";
+
+    //LOGI("dets: %d", dets.size());
 
     std::vector<matrix<rgb_pixel>> faces;
     for (auto face : dets)
@@ -259,27 +261,36 @@ Java_dlib_android_FaceRecognizer_recognizeNative1(JNIEnv *env,
         faces.push_back(move(face_chip));
     }
 
+    //LOGI("faces: %d", faces.size());
+
     std::vector<matrix<float, 0, 1>> face_descriptors = net1(faces);
 
     for (size_t i = 0; i < face_descriptors.size(); ++i)
     {
         std::string name = "Unknown";
-        for (auto& j : known_faces) {
+        for (auto j : known_faces) {
             float dist = length(face_descriptors[i] - j.second);
             if (dist < FACE_RECOGNIZE_THRESH) {
                 name = j.first;
                 break;
             }
         }
-        returnValue += name;
-        returnValue += " ";
+        names.push_back(name);
     }
 
     AndroidBitmap_unlockPixels(env, bmp);
-    return env->NewStringUTF(returnValue.c_str());
+
+    if(names.size() > 0) {
+        strarr = env->NewObjectArray(names.size(), env->FindClass("java/lang/String"), nullptr);
+        for (int i = 0; i < names.size(); ++i)
+        {
+            env->SetObjectArrayElement(strarr, i, env->NewStringUTF(names[i].c_str()));
+        }
+    }
+    return strarr;
 }extern "C"
 JNIEXPORT jstring JNICALL
-Java_dlib_android_FaceRecognizer_recognizeNative2(JNIEnv *env, jobject instance, jobject bmp) {
+Java_dlib_android_FaceRecognizer_recognizeFace(JNIEnv *env, jobject instance, jobject bmp) {
 
     AndroidBitmapInfo infocolor;
     void *pixelscolor;
@@ -357,6 +368,8 @@ Java_dlib_android_FaceRecognizer_recognizeNative2(JNIEnv *env, jobject instance,
     AndroidBitmap_unlockPixels(env, bmp);
 
     //std::string returnValue = "Unknown"  + std::to_string(min_dist);
+
+
     std::string returnValue = "Unknown";
     return env->NewStringUTF(returnValue.c_str());
 }

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

@@ -98,7 +98,7 @@ public SparseArray<Face> detect(Frame frame) {
             mT = new Thread(new Runnable() {
                 @Override
                 public void run() {
-                    String res = mFaceRecognizer.recognizeNative2(cropped);
+                    String res = mFaceRecognizer.recognizeFace(cropped);
                     recognitionHandler.onRecognized(res);
                 }
             });

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

@@ -28,6 +28,7 @@
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -249,8 +250,8 @@ public void onPictureTaken(byte[] bytes) {
                         new Thread(new Runnable() {
                             @Override
                             public void run() {
-                                final String res = mFaceRecognizer.recognizeNative1(temp);
-                                Toaster.toastLong(res);
+                                String[] array = mFaceRecognizer.recognizeFaces(temp);
+                                Toaster.toastLong(TextUtils.join(",", array));
                             }
                         }).start();
                     }

visionSamples/FaceTracker/app/src/main/java/com/google/android/gms/samples/vision/face/facetracker/CustomDetector.java

@@ -15,6 +15,6 @@ public void loadNative()
 
     private native int loadResourcesPart1();
     private native int loadResourcesPart2();
-    public native String recognizeNative1(Bitmap bmp); //full image screen
-    public native String recognizeNative2(Bitmap bmp); //customDetector
+    public native String[] recognizeFaces(Bitmap bmp); //full image screen
+    public native String recognizeFace(Bitmap bmp); //customDetector
 }