Merge pull request #66 from mlbo/master

Check whether the model exists before copying and update InsightFace api

Author: mlbo

Android/docs/Android_api.md

@@ -46,9 +46,40 @@ We merge all the functions into one interface
 	TengineKitSdk.getInstance().releaseFaceDetect()
 ``` 
 
+## ***3. InsightFace***
+### init
+``` kotlin
+	TengineKitSdk.getInstance().initInsightFace()
+```
 
+### predict
+We merge all the functions into one interface
+ 
+ ``` kotlin
+	val byte = ImageUtils.bitmap2RGB(bitmap)
+	val config = InsightFaceConfig().apply {
+		scrfd = true
+		recognition = true
+		registered = false
+		video = false
+	}
+	val imageConfig = ImageConfig().apply {
+		data = byte
+		degree = 0
+		mirror = false
+		height = it.height
+		width = it.width
+		format = ImageConfig.FaceImageFormat.RGB
+	}
+	val faces = TengineKitSdk.getInstance().detectInsightFace(imageConfig, config)
+ ```
+ 
+### release
+```kotlin
+	TengineKitSdk.getInstance().releaseInsightFace()
+``` 
 
-##  ***3. SegBody***
+##  ***4. SegBody***
 
 ### init
 
@@ -78,7 +109,7 @@ directly return a mask, the mask is a android bitmap, the mask's width is 398, t
 	TengineKitSdk.getInstance().releaseSegBody()
 ```
 
-##  ***4. BodyDetect***
+##  ***5. BodyDetect***
 
 ### init
 ``` kotlin
@@ -89,17 +120,17 @@ directly return a mask, the mask is a android bitmap, the mask's width is 398, t
 We merge all the functions into one interface
 
  ``` kotlin
- 	 val data = ImageUtils.bitmap2RGB(bitmap)
-    val imageConfig = ImageConfig().apply {
-        this.data = data
-        this.format = ImageConfig.FaceImageFormat.RGB
-        this.height = it.height
-        this.width = it.width
-        this.mirror = false
-        this.degree = 0
-    }
-    val bodyConfig = BodyConfig()
-    val bodyS = TengineKitSdk.getInstance().bodyDetect(imageConfig, bodyConfig)
+	val data = ImageUtils.bitmap2RGB(bitmap)
+	val imageConfig = ImageConfig().apply {
+		this.data = data
+		this.format = ImageConfig.FaceImageFormat.RGB
+		this.height = it.height
+		this.width = it.width
+		this.mirror = false
+		this.degree = 0
+	}
+	val bodyConfig = BodyConfig()
+	val bodyS = TengineKitSdk.getInstance().bodyDetect(imageConfig, bodyConfig)
  ```
 
 ### release
@@ -108,27 +139,36 @@ We merge all the functions into one interface
 ``` 
 
 
-## ***5.Release Context***
+## ***6.Release Context***
 ```
 	TengineKitSdk.getInstance().release()
 ```
 
 ## DataStruct
+### Config
+#### ImageConfig
+* data(byte[]): set image data byte array of image raw data
+* degree(int): set rotate degree need if in camera mode, need to rotate the right angle to detect the face
+* width(int): set bitmap width or preview width
+* height(int): set bitmap height or preview height
+* format(enum ImageConfig.FaceImageFormat): set image format, support RGB format and NV21 format current now
 
 #### FaceConfig
+ * detect(boolean): set true if need detect face rect
  * landmark2d(boolean): set true if need landmark2d except detect face rect
  * video(boolean): set true if in camera mode
 
+#### InsightFaceConfig
+ * scrfd(boolean): set true if need do scrfd
+ * recognition(boolean): set true if need do arcface
+ * registered(boolean): set true if already registered face
+
 #### SegConfig
 * default portrait segmentation config current
+#### BodyConfig
+ * landmark(boolean): set true if need body landmark 
 
-#### ImageConfig
-* data(byte[]): set image data byte array of image raw data
-* degree(int): set rotate degree need if in camera mode, need to rotate the right angle to detect the face
-* width(int): set bitmap width or preview width
-* height(int): set bitmap height or preview height
-* format(enum ImageConfig.FaceImageFormat): set image format, support RGB format and NV21 format current now
-
+### Info
 #### Face
 
 all detect values ​​are normalized from 0 to 1
@@ -146,6 +186,15 @@ all detect values ​​are normalized from 0 to 1
 * mouthClose: Mouth closure confidence 0~1
 * mouthBigOpen: Open mouth Big confidence 0~1
 
+#### InsightFace
+
+* x1: detect body rect left
+* y1: detect body rect top
+* x2: detect body rect right
+* y2: detect body rect bottom
+* landmark: if not null landmark contain 5 face key points
+* confidence: face detect confidence
+* feature: if not null feature contain 512 face feature points
 #### Body
 
 * x1: detect body rect left
@@ -157,3 +206,5 @@ all detect values ​​are normalized from 0 to 1
 
 
 
+
+

Android/source/app/src/main/AndroidManifest.xml

@@ -7,11 +7,13 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
+
     <application
         android:name=".MyApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Tenginedemo">

Android/source/app/src/main/java/com/tenginekit/tenginedemo/insightface/InsightFaceBitmapActivity.kt

@@ -24,7 +24,6 @@ import android.content.Intent
 import android.app.Activity
 import androidx.activity.result.contract.ActivityResultContracts
 import com.tenginekit.engine.core.SdkConfig
-import com.tenginekit.engine.insightface.InsightFace
 import com.tenginekit.engine.insightface.InsightFaceConfig
 import com.tenginekit.tenginedemo.Constant
 import com.tenginekit.tenginedemo.R
@@ -181,9 +180,10 @@ class InsightFaceBitmapActivity : AppCompatActivity(), View.OnClickListener {
                         )
                         faceLandmarks.add(i, faceLandmarkList)
                         faceRects[i] = rect
-                        faceFeature = face.Feature
+                        faceFeature = face.feature
                         val distance = calculSimilar(regFeature!!, faceFeature)
-                        Log.e("distance", distance.toString())
+                        Log.i(Constant.LOG_TAG, "Distance:" + distance.toString())
+                        Log.i(Constant.LOG_TAG, "Confidence:" + face.confidence.toString())
                     }
                     overlayView?.onProcessResults(faceRects)
                     overlayView?.onProcessResults(faceLandmarks)
@@ -254,7 +254,7 @@ class InsightFaceBitmapActivity : AppCompatActivity(), View.OnClickListener {
                         )
                         faceLandmarks.add(i, faceLandmarkList)
                         faceRects[i] = rect
-                        regFeature = face.Feature
+                        regFeature = face.feature
                     }
                     overlayView?.onProcessResults(faceRects)
                     overlayView?.onProcessResults(faceLandmarks)

Android/source/app/src/main/java/com/tenginekit/tenginedemo/utils/copyAssetFolder.kt

@@ -1,13 +1,18 @@
 package com.tenginekit.tenginedemo.utils
 
 import android.content.res.AssetManager
+import com.luck.picture.lib.tools.PictureFileUtils.isFileExists
 import java.io.File
 import java.io.File.separator
 import java.io.FileOutputStream
 import java.io.IOException
 import java.io.OutputStream
 
-fun AssetManager.copyAssetFolder(srcName: String, dstName: String, callback: ModelCopyCallback?): Boolean {
+fun AssetManager.copyAssetFolder(
+    srcName: String,
+    dstName: String,
+    callback: ModelCopyCallback?
+): Boolean {
     return try {
         var result = true
         val fileList = this.list(srcName) ?: return false
@@ -35,16 +40,19 @@ fun AssetManager.copyAssetFolder(srcName: String, dstName: String, callback: Mod
 
 fun AssetManager.copyAssetFile(srcName: String, dstName: String): Boolean {
     return try {
-        val inStream = this.open(srcName)
-        val outFile = File(dstName)
-        val out: OutputStream = FileOutputStream(outFile)
-        val buffer = ByteArray(1024)
-        var read: Int
-        while (inStream.read(buffer).also { read = it } != -1) {
-            out.write(buffer, 0, read)
+        if (!isFileExists(dstName)) {
+            val inStream = this.open(srcName)
+            val outFile = File(dstName)
+            val out: OutputStream = FileOutputStream(outFile)
+            val buffer = ByteArray(1024)
+            var read: Int
+            while (inStream.read(buffer).also { read = it } != -1) {
+                out.write(buffer, 0, read)
+            }
+
+            inStream.close()
+            out.close()
         }
-        inStream.close()
-        out.close()
         true
     } catch (e: IOException) {
         e.printStackTrace()
@@ -53,7 +61,7 @@ fun AssetManager.copyAssetFile(srcName: String, dstName: String): Boolean {
 }
 
 
-interface ModelCopyCallback{
+interface ModelCopyCallback {
     fun copyFinish()
     fun copyFail()
 }