Merge pull request #2 from hoopoe/AS-OpenCV-DLib-2modules

As open cv d lib 2modules

Author: vkocheryzhkin

dlib

@@ -1,4 +1,3 @@
-
 # Sets the minimum version of CMake required to build the native
 # library. You should either keep the default value or only pass a
 # value of 3.4.0 or lower.
@@ -7,8 +6,24 @@ cmake_minimum_required(VERSION 3.4.1)
 
 set (CMAKE_CXX_STANDARD 11)
 
+
+# OpenCV stuff
+# todo: use env variable to set opencv location
+include_directories("/Users/hoopoe/Tools/OpenCV-android-sdk/sdk/native/jni/include")
+add_library( lib_opencv SHARED IMPORTED )
+set_target_properties(lib_opencv PROPERTIES IMPORTED_LOCATION /Users/hoopoe/Tools/OpenCV-android-sdk/sdk/native/libs/${ANDROID_ABI}/libopencv_java3.so)
+
+find_library( # Sets the name of the path variable.
+              log-lib
+
+              # Specifies the name of the NDK library that
+              # you want CMake to locate.
+              log )
+
 set(DLIB_DIR ../../../dlib)
 include_directories(${DLIB_DIR})
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 add_library( # Sets the name of the library.
              lib_dlib
@@ -41,24 +56,6 @@ add_library( # Sets the name of the library.
              # file are automatically included.
              src/main/cpp/native-lib.cpp )
 
-
-# Searches for a specified prebuilt library and stores the path as a
-# variable. Because system libraries are included in the search path by
-# default, you only need to specify the name of the public NDK library
-# you want to add. CMake verifies that the library exists before
-# completing its build.
-
-find_library( # Sets the name of the path variable.
-              log-lib
-
-              # Specifies the name of the NDK library that
-              # you want CMake to locate.
-              log )
-
-# Specifies libraries CMake should link to your target library. You
-# can link multiple libraries, such as libraries you define in the
-# build script, prebuilt third-party libraries, or system libraries.
-
 target_link_libraries( # Specifies the target library.
                        native-lib
 
@@ -68,4 +65,24 @@ target_link_libraries( # Specifies the target library.
 
                        # Links the target library to the log library
                        # included in the NDK.
+                       ${log-lib} )
+
+
+
+add_library( # Sets the name of the library.
+             OCV-native-lib
+
+             # Sets the library as a shared library.
+             SHARED
+
+             # 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 )
+
+target_link_libraries(
+                        OCV-native-lib
+
+                       lib_opencv
+
                        ${log-lib} )

visionSamples/FaceTracker/app/CMakeLists.txt

@@ -20,26 +20,44 @@ android {
         externalNativeBuild {
             cmake {
                 cppFlags "-frtti -fexceptions"
-                abiFilters 'x86', 'x86_64', 'armeabi-v7a'
-                arguments "-DANDROID_STL=c++_shared"
+                //abiFilters 'x86', 'x86_64', '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
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+
+//    sourceSets { // AL: added
+//        main {
+//            jniLibs.srcDirs = ['src/main/jniLibs']
+//            jni.srcDirs = ['src/main/jni', 'src/main/jniLibs/']
+//            //jni.srcDirs = []
+//        }
+//    }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.config
         }
     }
+
+    externalNativeBuild {
+        cmake {
+            path "CMakeLists.txt"
+        }
+    }
+
     testBuildType "release"
     externalNativeBuild {
         cmake {
@@ -54,6 +72,7 @@ android {
 }
 
 dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation 'junit:junit:4.12'
     implementation 'com.android.support:support-annotations:27.1.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

visionSamples/FaceTracker/app/build.gradle

@@ -0,0 +1,55 @@
+#include <jni.h>
+#include <string>
+#include <opencv2/opencv.hpp>
+
+/* these seem not needed */
+#include <opencv2/core/core.hpp>
+#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/objdetect/objdetect.hpp>
+#include <opencv2/objdetect/detection_based_tracker.hpp>
+#include <opencv2/features2d/features2d.hpp>
+
+#include <android/log.h>
+
+using namespace std;
+using namespace cv;
+
+#define AppTag "OCV-FD::Activity"
+
+extern "C"
+{
+
+
+void detect(Mat &gray) {
+
+    String face_cascade_name = "/storage/emulated/0/Movies/haarcascade_frontalface_default.xml";
+
+    CascadeClassifier face_cascade;
+    std::vector<Rect> faces;
+
+    if( !face_cascade.load( face_cascade_name ) ){
+        printf("--(!)Error loading\n");
+        __android_log_print(ANDROID_LOG_DEBUG, AppTag, "Resources NOT found: exiting");
+        return;
+    }
+
+    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);
+    }
+}
+
+
+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);
+}
+
+}

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

@@ -15,4 +15,5 @@
 # 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
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.useDeprecatedNdk=true