try to fix permission issue

vkocheryzhkin · vkocheryzhkin · commit 01425546dcc1 · 2018-06-02T20:18:05.000+03:00
diff --git a/FaceTracker/app/src/main/AndroidManifest.xml b/FaceTracker/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <!--<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <uses-sdk
         android:minSdkVersion="15"
@@ -20,7 +20,7 @@
         android:hardwareAccelerated="true"
         android:icon="@drawable/icon"
         android:theme="@style/Theme.AppCompat"
-        android:label="FaceTracker"
+        android:label="Face Recognition"
         android:largeHeap="true">
 
         <meta-data android:name="com.google.android.gms.version"
@@ -33,7 +33,7 @@
         <activity
             android:name="com.google.android.gms.samples.vision.face.facetracker.FaceTrackerActivity"
             android:icon="@drawable/icon"
-            android:label="SG"
+            android:label="Face Recognition"
             android:theme="@style/Theme.AppCompat.NoActionBar"
             android:screenOrientation="fullSensor">
             <intent-filter>
diff --git a/FaceTracker/app/src/main/cpp/OCV-native-lib.cpp b/FaceTracker/app/src/main/cpp/OCV-native-lib.cpp
@@ -22,7 +22,7 @@ extern "C"
 
 void detect(Mat &gray) {
 
-    String face_cascade_name = "/storage/emulated/0/Movies/haarcascade_frontalface_default.xml";
+    String face_cascade_name = "/sdcard/Download/haarcascade_frontalface_default.xml";
 
     CascadeClassifier face_cascade;
     std::vector<Rect> faces;
diff --git a/FaceTracker/app/src/main/cpp/native-lib.cpp b/FaceTracker/app/src/main/cpp/native-lib.cpp
@@ -72,85 +72,23 @@ float FACE_RECOGNIZE_THRESH = 0.55;
 
 extern "C"
 JNIEXPORT jint JNICALL
-Java_com_google_android_gms_samples_vision_face_facetracker_FaceTrackerActivity_loadResources(
-        JNIEnv *env, jobject instance)
-{
-
-    LOGI("load resource");
-    FILE *file1 = fopen("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat", "r+");
-    FILE *file2 = fopen("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat",
-                        "r+");
-    //FILE *file3 = fopen("/storage/emulated/0/Download/faces_linear.svm", "r+");
-
-    if (file1 != NULL && file2 != NULL ) {
-        fclose(file1);
-        fclose(file2);
-        //fclose(file3);
-        dlib::deserialize("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat")
-                >> sp;
-        dlib::deserialize("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat")
-                >> sp1;
-        dlib::deserialize("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat")
-                >> net;
-        dlib::deserialize("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat")
-                >> net1;
-        //dlib::deserialize("/storage/emulated/0/Download/faces_linear.svm") >> df;
-
-        DIR *d;
-        char *p1,*p2;
-        int ret;
-        struct dirent *dir;
-        d = opendir("/storage/emulated/0/Download");
-        if (d)
-        {
-            LOGI("Loading feature vectors using *.vec", p1);
-            while ((dir = readdir(d)) != NULL)
-            {
-                p1=strtok(dir->d_name,".");
-                p2=strtok(NULL,".");
-                if(p2!=NULL)
-                {
-                    ret=strcmp(p2,"vec");
-                    if(ret==0)
-                    {
-                        std::string name = std::string(p1);
-                        std::string file = name + ".vec";
-                        matrix<float, 0, 1> face_vector;
-                        dlib::deserialize("/storage/emulated/0/Download/"  + file) >> face_vector;
-                        known_faces.insert({name, face_vector});
-                    }
-                }
-
-            }
-            closedir(d);
-        }
-    } else {
-        return 1; //failed
-    }
-
-    return 0;
-}extern "C"
-JNIEXPORT jint JNICALL
 Java_dlib_android_FaceRecognizer_loadResourcesPart1(JNIEnv *env, jobject instance) {
 
     LOGI("load resource part1");
-    FILE *file1 = fopen("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat", "r+");
-    FILE *file2 = fopen("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat",
-                        "r+");
+    FILE *file1 = fopen("/sdcard/Download/shape_predictor_5_face_landmarks.dat", "r+");
+    FILE *file2 = fopen("/sdcard/Download/dlib_face_recognition_resnet_model_v1.dat", "r+");
 
     if (file1 != NULL && file2 != NULL ) {
         fclose(file1);
         fclose(file2);
-        dlib::deserialize("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat")
-                >> sp;
-        dlib::deserialize("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat")
-                >> net;
+        dlib::deserialize("/sdcard/Download/shape_predictor_5_face_landmarks.dat") >> sp;
+        dlib::deserialize("/sdcard/Download/dlib_face_recognition_resnet_model_v1.dat") >> net;
 
         DIR *d;
         char *p1,*p2;
         int ret;
         struct dirent *dir;
-        d = opendir("/storage/emulated/0/Download");
+        d = opendir("/sdcard/Download");
         if (d)
         {
             LOGI("Loading feature vectors using *.vec", p1);
@@ -166,7 +104,7 @@ Java_dlib_android_FaceRecognizer_loadResourcesPart1(JNIEnv *env, jobject instanc
                         std::string name = std::string(p1);
                         std::string file = name + ".vec";
                         matrix<float, 0, 1> face_vector;
-                        dlib::deserialize("/storage/emulated/0/Download/"  + file) >> face_vector;
+                        dlib::deserialize("/sdcard/Download/"  + file) >> face_vector;
                         known_faces.insert({name, face_vector});
                     }
                 }
@@ -175,6 +113,7 @@ Java_dlib_android_FaceRecognizer_loadResourcesPart1(JNIEnv *env, jobject instanc
             closedir(d);
         }
     } else {
+        LOGI("Failed to load resources part1");
         return -1; //failed
     }
 
@@ -185,18 +124,16 @@ JNIEXPORT jint JNICALL
 Java_dlib_android_FaceRecognizer_loadResourcesPart2(JNIEnv *env, jobject instance) {
 
     LOGI("load resource part2");
-    FILE *file1 = fopen("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat", "r+");
-    FILE *file2 = fopen("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat",
-                        "r+");
+    FILE *file1 = fopen("/sdcard/Download/shape_predictor_5_face_landmarks.dat", "r+");
+    FILE *file2 = fopen("/sdcard/Download/dlib_face_recognition_resnet_model_v1.dat", "r+");
 
     if (file1 != NULL && file2 != NULL ) {
         fclose(file1);
         fclose(file2);
-        dlib::deserialize("/storage/emulated/0/Download/shape_predictor_5_face_landmarks.dat")
-                >> sp1;
-        dlib::deserialize("/storage/emulated/0/Download/dlib_face_recognition_resnet_model_v1.dat")
-                >> net1;
+        dlib::deserialize("/sdcard/Download/shape_predictor_5_face_landmarks.dat") >> sp1;
+        dlib::deserialize("/sdcard/Download/dlib_face_recognition_resnet_model_v1.dat") >> net1;
     } else{
+        LOGI("Failed to load resources part2");
         return -1;
     }
     return 0;
@@ -234,7 +171,7 @@ Java_dlib_android_FaceRecognizer_recognizeFaces(JNIEnv *env,
 
     img.set_size(infocolor.height, infocolor.width);
 
-    LOGI("size w=%d h=%d", infocolor.width, infocolor.height);
+//    LOGI("size w=%d h=%d", infocolor.width, infocolor.height);
     for (y = 0; y < infocolor.height; y++) { //todo: performance
         argb *line = (argb *) pixelscolor;
         for (x = 0; x < infocolor.width; ++x) {
@@ -302,6 +239,7 @@ Java_dlib_android_FaceRecognizer_recognizeFace(JNIEnv *env, jobject instance, jo
     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);
 
+    LOGI("known_faces size %d", known_faces.size());
     if (infocolor.format != ANDROID_BITMAP_FORMAT_RGBA_8888) {
         LOGE("Bitmap format is not RGBA_8888 !");
         return env->NewStringUTF("Image broken 2");
@@ -328,7 +266,7 @@ Java_dlib_android_FaceRecognizer_recognizeFace(JNIEnv *env, jobject instance, jo
     LOGI("detected size %d", dets.size());
 
     float min_dist = 0.0;
-    if(dets.size() > 0 ){
+    if(dets.size() > 0  ){
         auto face = dets.front();
         std::vector<matrix<rgb_pixel>> faces;
         int x = face.left();
@@ -337,18 +275,18 @@ Java_dlib_android_FaceRecognizer_recognizeFace(JNIEnv *env, jobject instance, jo
         int height = face.height();
 
         auto shape = sp(img, face);
-        LOGI("shape predictor");
+//        LOGI("shape predictor");
         matrix<rgb_pixel> face_chip;
         extract_image_chip(img, get_face_chip_details(shape, 150, 0.25), face_chip);
         faces.push_back(move(face_chip));
 
-        LOGI("before recognized size %d", 0);
+//        LOGI("before recognized size %d", -1);
         std::vector<matrix<float, 0, 1>> face_descriptors = net(faces);
-        LOGI("after recognized size %d", face_descriptors.size());
+//        LOGI("after recognized size %d", face_descriptors.size());
         if (face_descriptors.size() > 0)
         {
             matrix<float, 0, 1> face_desc = face_descriptors[0];
-            for (auto& i : known_faces) {
+            for (auto i : known_faces) {
                 float dist = length(face_desc -  i.second );
                 if (dist < min_dist){
                     min_dist = dist;
@@ -363,7 +301,7 @@ Java_dlib_android_FaceRecognizer_recognizeFace(JNIEnv *env, jobject instance, jo
         LOGI("not recognized, max dist %0.2f", min_dist);
     }
 
-//    LOGI("unlocking pixels");
+    LOGI("unlocking pixels");
     AndroidBitmap_unlockPixels(env, bmp);
 
     std::string returnValue = "Unknown";
diff --git a/FaceTracker/app/src/main/java/com/google/android/gms/samples/vision/face/facetracker/FaceTrackerActivity.java b/FaceTracker/app/src/main/java/com/google/android/gms/samples/vision/face/facetracker/FaceTrackerActivity.java
@@ -98,7 +98,9 @@ public void onCreate(Bundle icicle) {
         // permission is not granted yet, request permission.
         int rc = ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA);
         int rs = ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
+
         if (rc == PackageManager.PERMISSION_GRANTED && rs == PackageManager.PERMISSION_GRANTED) {
+
             createCameraSource();
         } else {
             requestCameraAndSdCardPermission();
@@ -114,7 +116,8 @@ private void requestCameraAndSdCardPermission() {
         Log.w(TAG, "Camera and sdcard permissions are not granted. Requesting permission");
 
         final String[] permissions = new String[]{Manifest.permission.CAMERA,
-        Manifest.permission.READ_EXTERNAL_STORAGE};
+                Manifest.permission.READ_EXTERNAL_STORAGE,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE};
 
         if (!ActivityCompat.shouldShowRequestPermissionRationale(this,
                 Manifest.permission.CAMERA)) {
@@ -140,12 +143,9 @@ public void onClick(View view) {
 
     private void calcCameraFrameSize()
     {
-//        Log.i(TAG, String.format("width %d height %d", mFrontCamWidth, mFrontCamHeight));
-        Log.i(TAG, "test");
         int numCameras = Camera.getNumberOfCameras();
-        Log.i(TAG, String.format("%d",numCameras));
 
-        for (int i=0;i<numCameras;i++)
+        for (int i = 0; i < numCameras; i++)
         {
             Camera.CameraInfo cameraInfo=new Camera.CameraInfo();
             Camera.getCameraInfo(i, cameraInfo);
@@ -154,21 +154,15 @@ private void calcCameraFrameSize()
                 Camera camera= Camera.open(i);
                 Camera.Parameters cameraParams=camera.getParameters();
                 List<Camera.Size> sizes= cameraParams.getSupportedPreviewSizes();
-                Log.i(TAG, String.format("front sizes %d", sizes.size()));
                 mFrontCamWidth = sizes.get(0).width;
                 mFrontCamHeight = sizes.get(0).height;
-                Log.i(TAG, String.format("mFrontCamWidth %d", mFrontCamWidth));
-                Log.i(TAG, String.format("mFrontCamHeight %d", mFrontCamHeight));
                 camera.release();
             } else if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_BACK) {
                 Camera camera = Camera.open(i);
                 Camera.Parameters cameraParams = camera.getParameters();
                 List<Camera.Size> sizes = cameraParams.getSupportedPreviewSizes();
-                Log.i(TAG, String.format("back sizes %d", sizes.size()));
                 mBackCamWidth = sizes.get(0).width;
                 mBackCamHeight = sizes.get(0).height;
-                Log.i(TAG, String.format("mBackCamWidth %d", mBackCamWidth));
-                Log.i(TAG, String.format("mBackCamHeight %d", mBackCamHeight));
                 camera.release();
             }
         }
@@ -223,15 +217,12 @@ private void createCameraSource() {
 //            Log.w(TAG, "mPictureDetector dependencies are not yet available.");
 //        }
 
-        //.setRequestedPreviewSize(640, 480)
-        //.setRequestedFps(30.0f)
-        //.setFacing(CameraSource.CAMERA_FACING_BACK)
         calcCameraFrameSize();
         mCameraSource = new CameraSource.Builder(context, customDetector)
                 .setRequestedPreviewSize(mBackCamWidth, mBackCamHeight)
                 .setFacing(CameraSource.CAMERA_FACING_BACK)
                 .setAutoFocusEnabled(true)
-                .setRequestedFps(20)
+                .setRequestedFps(10)
                 .build();
 
 //        mBtnDetect.setOnClickListener(new View.OnClickListener() {
@@ -324,6 +315,7 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
         if (grantResults.length != 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
             Log.d(TAG, "Camera permission granted - initialize the camera source");
             // we have permission, so create the camerasource
+            mFaceRecognizer.loadNative();
             createCameraSource();
 
             return;
diff --git a/FaceTracker/app/src/main/java/com/google/android/gms/samples/vision/face/facetracker/ui/camera/CameraSourcePreview.java b/FaceTracker/app/src/main/java/com/google/android/gms/samples/vision/face/facetracker/ui/camera/CameraSourcePreview.java
@@ -149,10 +149,10 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
         int childHeight = (int)(((float) layoutWidth / (float) width) * height);
 
         // If height is too tall using fit width, does fit height instead.
-        if (childHeight > layoutHeight) {
-            childHeight = layoutHeight;
-            childWidth = (int)(((float) layoutHeight / (float) height) * width);
-        }
+//        if (childHeight > layoutHeight) {
+//            childHeight = layoutHeight;
+//            childWidth = (int)(((float) layoutHeight / (float) height) * width);
+//        }
 
         for (int i = 0; i < getChildCount(); ++i) {
             getChildAt(i).layout(0, 0, childWidth, childHeight);
