Ocv fdt

.travis.yml

@@ -13,10 +13,13 @@ before_install:
   - mkdir -p $ANDROID_HOME/licenses
   - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_HOME/licenses/android-sdk-license
   - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_HOME/licenses/android-sdk-license
+  - sdkmanager --list || true
 install:
   - echo y | sdkmanager "ndk-bundle"
   - echo y | sdkmanager "cmake;3.6.4111459"
   - echo y | sdkmanager "lldb;3.1"
+  - sdkmanager --list || true
+
 
 android:
   components:
@@ -43,10 +46,11 @@ before_script:
 #  - export OPENCV_ANDROID_SDK=$(pwd)/OpenCV-android-sdk
   - export OPENCV_ANDROID_SDK=$(pwd)/opencv3-android-sdk-with-contrib-master/OpenCV-android-sdk
 #
-  - wget --no-check-certificate 'https://docs.google.com/uc?export=download&id=13ZlJvIRBpxydJcm64tS_czQm3e0SBwVu' -O jniLibss.zip
+# - wget --no-check-certificate 'https://docs.google.com/uc?export=download&id=13ZlJvIRBpxydJcm64tS_czQm3e0SBwVu' -O jniLibss.zip
+  - wget --no-check-certificate 'http://www.webito.net/opencvlibs/openalprJniLibs.zip' -O jniLibss.zip
   - unzip jniLibss.zip
   - export OPENALPR_LIBS=$(pwd)/jniLibs
-
+    
 script:
 - cd FaceTracker
 - ./gradlew build

FaceTracker/app/CMakeLists.txt

@@ -10,6 +10,7 @@ include_directories($ENV{OPENCV_ANDROID_SDK}/sdk/native/jni/include)
 add_library( lib_opencv SHARED IMPORTED )
 set_target_properties(lib_opencv PROPERTIES IMPORTED_LOCATION $ENV{OPENCV_ANDROID_SDK}/sdk/native/libs/${ANDROID_ABI}/libopencv_java3.so)
 
+
 find_library( # Sets the name of the path variable.
               log-lib
 
@@ -53,6 +54,7 @@ add_library( # Sets the name of the library.
              # file are automatically included.
              src/main/cpp/native-lib.cpp )
 
+
 target_link_libraries( # Specifies the target library.
                        native-lib
 
@@ -65,7 +67,6 @@ target_link_libraries( # Specifies the target library.
                        ${log-lib} )
 
 
-
 add_library( # Sets the name of the library.
              OCV-native-lib
 
@@ -75,8 +76,8 @@ add_library( # Sets the name of the library.
              # Provides a relative path to your source file(s).
              # Associated headers in the same location as their source
              # file are automatically included.
-               src/main/cpp/OCV-native-lib.cpp
-             )
+             src/main/cpp/OCV-native-lib.cpp )
+
 
 target_link_libraries(
                        OCV-native-lib
@@ -85,6 +86,7 @@ target_link_libraries(
 
                        ${log-lib} )
 
+
 add_library( # Sets the name of the library.
             OCV-DetectionBasedTracker
 
@@ -94,8 +96,7 @@ add_library( # Sets the name of the library.
             # Provides a relative path to your source file(s).
             # Associated headers in the same location as their source
             # file are automatically included.
-            src/main/cpp/DetectionBasedTracker_jni.cpp
-            )
+            src/main/cpp/DetectionBasedTracker_jni.cpp )
 
 target_link_libraries(
                       OCV-DetectionBasedTracker

FaceTracker/app/build.gradle

@@ -21,18 +21,19 @@ android {
         externalNativeBuild {
             cmake {
                 cppFlags "-frtti -fexceptions -std=c++11"
-                abiFilters 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-                arguments "-DANDROID_STL=gnustl_shared"
+                // abiFilters 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+                abiFilters 'armeabi-v7a'
+                arguments "-DANDROID_STL=c++_static"
             }
         }
         signingConfig signingConfigs.config
 
         // Specifies the application ID for the test APK.
-        testApplicationId "org.opencv.android.facetracker"
+        // testApplicationId "opencv.android.fdt"
+        // testApplicationId "org.opencv.android.facetracker"
         // Specifies the fully-qualified class name of the test instrumentation runner.
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-
     }
 
 
@@ -67,13 +68,13 @@ android {
             jniLibs.srcDirs = [
                     'src/main/jniLibs']
             resources.srcDirs=[
-                    'src/main/resources', 'src/main/res/raw']}
+                    'src/main/resources', 'src/main/res/raw']
+        }
         androidTest {  // AL (
             java.srcDir file('src/androidTest/java')
             resources.srcDir file('src/androidTest/assets')
         } // AL )
     }
-
     configurations.all {
         resolutionStrategy.force 'com.android.support:support-annotations:23.4.0'
     }

FaceTracker/app/jni/CMakeLists.txt

@@ -49,8 +49,8 @@ target_include_directories(tensorflow_detector PRIVATE
 
 add_custom_command(TARGET tensorflow_detector POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory
-         "$ENV{OPENALPR_LIBS}"
-        ${CMAKE_SOURCE_DIR}/src/main/jniLibs)
+       "$ENV{OPENALPR_LIBS}"
+       ${CMAKE_SOURCE_DIR}/src/main/jniLibs)
 
 target_link_libraries(tensorflow_detector
                       android

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

@@ -1,32 +1,127 @@
 package com.google.android.gms.samples.vision.face.facetracker;
 
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.os.Environment;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import android.util.SparseArray;
+import com.google.android.gms.vision.Detector;
+import com.google.android.gms.vision.face.FaceDetector;
+import com.google.android.gms.vision.Frame;
+import com.google.android.gms.vision.face.Face;
+
 import static junit.framework.Assert.assertEquals;
 
 @RunWith(AndroidJUnit4.class)
 public class ExampleInstrumentedTest {
+
+    private static final        String TAG = "GMS-Test";
+    private Detector<Face>      mDetector;
+    private String              filename = "GMS-SolvayRes.png";
+    private String              AppResPath = "/myAppRes/";
+
+    /*
     @Test
     public void useAppContext() throws Exception {
+        Log.i(TAG, "In useAppContext ");
         Context appContext = InstrumentationRegistry.getTargetContext();
         assertEquals("com.google.android.gms.samples.vision.face.facetracker", appContext.getPackageName());
     }
 
-
     @Rule
     public ActivityTestRule<FaceTrackerActivity> activityRule = new ActivityTestRule(FaceTrackerActivity.class);
 
     @Test
     public void callAddContext()  {
+        Log.i(TAG, "In callAddContext ");
         FaceTrackerActivity activity  = activityRule.getActivity();
-//        int res = activity.nativeAdd(1,2);
-//        assertEquals(3, res);
+//      int res = activity.nativeAdd(1,2);
+//      assertEquals(3, res);
+    }
+    */
+
+    @Test
+    public void gmsDetectionTest() throws IOException {
+
+        Context testContext = InstrumentationRegistry.getInstrumentation().getContext();
+        Context appContext =  InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
+
+        //InputStream testInput = testContext.getAssets().open("11.png");
+        InputStream testInput = testContext.getAssets().open("SolvayConf.jpg");
+        Bitmap bitmap = BitmapFactory.decodeStream(testInput);
+        Log.d(TAG, bitmap.getWidth() + " " + bitmap.getHeight());
+
+        FaceDetector mDetector = new FaceDetector.Builder(appContext) // using testContext didn't work
+                .setTrackingEnabled(true)
+                .setClassificationType(FaceDetector.NO_CLASSIFICATIONS)
+                .setProminentFaceOnly(false)
+                .setMode(FaceDetector.ACCURATE_MODE)
+                .setMinFaceSize(0.015f)
+                .build();
+
+        SparseArray<Face> faces = null;
+
+        if (!mDetector.isOperational()) {
+            Log.i(TAG, "Detector is NOT operational ");
+        } else {
+            Frame frame = new Frame.Builder().setBitmap(bitmap).build();
+            faces = mDetector.detect(frame);
+            mDetector.release();
+            Log.i(TAG, "GMS-TEST Number of faces = " + faces.size());
+        }
+
+        Bitmap mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
+        Canvas canvas = new Canvas(mutableBitmap); // Create a canvas instance pointing to the bitmap
+
+        Paint paint = new Paint();
+        paint.setColor(Color.RED);
+        paint.setStrokeWidth(5.0f);
+        paint.setStyle(Paint.Style.STROKE);
+
+        // all that is drawn on canvas it is also on the bitmap
+        for(int i=0; i < faces.size(); i++){
+            int key = faces.keyAt(i);
+            Face face = faces.get(key); // get object by the key
+            // Face face = mFaces.get(i);
+
+            canvas.drawRect(face.getPosition().x, face.getPosition().y,
+                            face.getPosition().x + face.getWidth(),
+                            face.getPosition().y + face.getHeight(), paint);
+        }
+
+        try {
+            // get SD Card dir
+            String SDCardPath = Environment.getExternalStorageDirectory().toString();
+            new File(SDCardPath + AppResPath).mkdirs();
+            File imageFile = new File(SDCardPath + AppResPath + filename);
+            Log.i(TAG,"file= " + imageFile);
+
+            FileOutputStream outStream = new FileOutputStream(imageFile);
+            // compress BitMap and write image to the OutputStream
+            mutableBitmap.compress(Bitmap.CompressFormat.PNG, 80, outStream); // 100 = full quality
+
+            outStream.flush();
+            outStream.close();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }