Ocv instr test

.gitignore

@@ -5,3 +5,6 @@ build/
 local.properties
 .DS_Store
 captures/
+*.a
+*.so
+FaceTracker/app/.externalNativeBuild/

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "dlib"]
+	path = dlib
+	url = git://github.com/hoopoe/dlib.git
+        branch = android

.travis.yml

@@ -0,0 +1,48 @@
+language: android
+jdk:
+  - oraclejdk8
+branches:
+  only:
+  - master
+env:
+  global:
+    - ANDROID_TARGET=android-23
+    - ANDROID_ABI=armeabi-v7a
+
+before_install:
+  - mkdir -p $ANDROID_HOME/licenses
+  - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_HOME/licenses/android-sdk-license
+  - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_HOME/licenses/android-sdk-license
+install:
+  - echo y | sdkmanager "ndk-bundle"
+  - echo y | sdkmanager "cmake;3.6.4111459"
+  - echo y | sdkmanager "lldb;3.1"
+
+android:
+  components:
+    - tools
+    - platform-tools
+    - build-tools-27.0.3
+    - android-23
+    - extra-android-m2repository
+    - sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
+
+  licenses:
+    - android-sdk-preview-license-.+
+    - android-sdk-license-.+
+    - google-gdk-license-.+
+
+before_install:
+  - echo $(ant -version)
+
+before_script:
+  - wget https://github.com/opencv/opencv/releases/download/3.4.1/opencv-3.4.1-android-sdk.zip
+  - unzip -q opencv-3.4.1-android-sdk.zip
+  - export OPENCV_ANDROID_SDK=$(pwd)/OpenCV-android-sdk
+  - git clone https://github.com/tensorflow/tensorflow.git
+  - export TF_SRC_ROOT=$(pwd)/tensorflow
+
+script:
+- cd FaceTracker
+- ./gradlew build
+

FaceTracker/app/CMakeLists.txt

@@ -0,0 +1,87 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.4.1)
+set(CMAKE_VERBOSE_MAKEFILE on)
+set (CMAKE_CXX_STANDARD 11)
+
+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
+
+              # 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
+
+             # 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.
+             ../../dlib/dlib/threads/threads_kernel_shared.cpp
+             ../../dlib/dlib/entropy_decoder/entropy_decoder_kernel_2.cpp
+             ../../dlib/dlib/base64/base64_kernel_1.cpp
+             ../../dlib/dlib/threads/threads_kernel_1.cpp
+             ../../dlib/dlib/threads/threads_kernel_2.cpp
+             ../../dlib/dlib/threads/thread_pool_extension.cpp
+             ../../dlib/dlib/threads/async.cpp
+             ../../dlib/dlib/dnn/cpu_dlib.cpp
+             ../../dlib/dlib/dnn/tensor_tools.cpp
+             )
+
+add_library( # Sets the name of the library.
+             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/native-lib.cpp )
+
+target_link_libraries( # Specifies the target library.
+                       native-lib
+
+                       lib_dlib
+
+                        -ljnigraphics
+
+                       # 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} )
+
+add_subdirectory("./jni")

FaceTracker/app/build.gradle

@@ -0,0 +1,99 @@
+apply plugin: 'com.android.application'
+// Output directory in the local directory for packaging into the APK.
+
+android {
+    signingConfigs {
+        config {
+            keyAlias 'test'
+            keyPassword 'test123321'
+            storeFile file('signing/test.jks')
+            storePassword 'test123321'
+        }
+    }
+    compileSdkVersion 23
+    buildToolsVersion '27.0.3'
+    defaultConfig {
+        applicationId "com.google.android.gms.samples.vision.face.facetracker"
+        minSdkVersion 15 // AL 21 ==> 15
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+        externalNativeBuild {
+            cmake {
+                cppFlags "-frtti -fexceptions -std=c++11"
+                abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+                arguments "-DANDROID_STL=gnustl_shared"
+            }
+        }
+        signingConfig signingConfigs.config
+
+
+        // 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"
+
+    }
+
+//    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 {
+            path "CMakeLists.txt"
+        }
+    }
+    productFlavors {
+    }
+    lintOptions {
+        abortOnError false
+    }
+
+    sourceSets {main {jniLibs.srcDirs=['src/main/jni', 'src/main/jniLibs/'] }
+                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'
+    }
+}
+
+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'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:support-v4:23.4.0'
+    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 'org.tensorflow:tensorflow-android:+'
+    implementation project(':openCVLibrary330')
+}

FaceTracker/app/jni/CMakeLists.txt

@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+project(TENSORFLOW_DETECTOR)
+cmake_minimum_required(VERSION 3.4.1)
+
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+get_filename_component(SAMPLE_SRC_DIR  ${CMAKE_SOURCE_DIR}/  ABSOLUTE)
+
+if (ANDROID_ABI MATCHES "^armeabi-v7a$")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=softfp -mfpu=neon")
+elseif(ANDROID_ABI MATCHES "^arm64-v8a")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -ftree-vectorize")
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTANDALONE_DEMO_LIB \
+                    -std=c++11 -fno-exceptions -fno-rtti -O2 -Wno-narrowing \
+                    -fPIE")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} \
+                              -Wl,--allow-multiple-definition \
+                              -Wl,--whole-archive -fPIE -v")
+
+file(GLOB_RECURSE tensorflow_detector_sources ${SAMPLE_SRC_DIR}/jni/*.*)
+
+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 )
+
+add_library(tensorflow_detector SHARED
+            ${tensorflow_detector_sources})
+target_include_directories(tensorflow_detector PRIVATE
+                           ${CMAKE_SOURCE_DIR})
+
+target_link_libraries(tensorflow_detector
+                      android
+                      log
+                      jnigraphics
+                      m
+                      atomic
+                      z)