vision-camera-face-detection 1.2.3 → 1.2.4

package/android/src/main/java/com/visioncamerafacedetection/VisionCameraFaceDetectionPlugin.kt

@@ -42,11 +42,15 @@ class VisionCameraFaceDetectionPlugin(
   private var runClassifications = false
   private var runContours = false
   private var trackingEnabled = false
+  private var enableTensor = false
 
   init {
     // handle auto scaling
     autoScale = options?.get("autoScale").toString() == "true"
 
+    // handle enable/disable tensor
+    enableTensor = options?.get("enableTensor").toString() == "true"
+
     // initializes faceDetector on creation
     var performanceModeValue = FaceDetectorOptions.PERFORMANCE_MODE_FAST
     var landmarkModeValue = FaceDetectorOptions.LANDMARK_MODE_NONE
@@ -117,16 +121,19 @@ class VisionCameraFaceDetectionPlugin(
         bounds["x"] = (-y + sourceWidth * scaleX) - width
         bounds["y"] = (-x + sourceHeight * scaleY) - height
       }
+
       Orientation.LANDSCAPE_LEFT -> {
         // device is portrait
         bounds["x"] = (-x + sourceWidth * scaleX) - width
         bounds["y"] = y
       }
+
       Orientation.PORTRAIT_UPSIDE_DOWN -> {
         // device is landscape right
         bounds["x"] = y
         bounds["y"] = x
       }
+
       Orientation.LANDSCAPE_RIGHT -> {
         // device is upside down
         bounds["x"] = x
@@ -289,30 +296,36 @@ class VisionCameraFaceDetectionPlugin(
       val task = faceDetector!!.process(image)
       val faces = Tasks.await(task)
       faces.forEach { face ->
-        val bmpFrameResult = ImageConvertUtils.getInstance().getUpRightBitmap(image)
-        val bmpFaceResult =
-          Bitmap.createBitmap(
-            TF_OD_API_INPUT_SIZE,
-            TF_OD_API_INPUT_SIZE,
-            Bitmap.Config.ARGB_8888
-          )
-        val faceBB = RectF(face.boundingBox)
-        val cvFace = Canvas(bmpFaceResult)
-        val sx = TF_OD_API_INPUT_SIZE.toFloat() / faceBB.width()
-        val sy = TF_OD_API_INPUT_SIZE.toFloat() / faceBB.height()
-        val matrix = Matrix()
-        matrix.postTranslate(-faceBB.left, -faceBB.top)
-        matrix.postScale(sx, sy)
-        cvFace.drawBitmap(bmpFrameResult, matrix, null)
-        val input: ByteBuffer = FaceHelper().bitmap2ByteBuffer(bmpFaceResult)
-        val output: FloatBuffer = FloatBuffer.allocate(192)
-        interpreter?.run(input, output)
-
+        val map: MutableMap<String, Any> = HashMap()
         val arrayData: MutableList<Any> = ArrayList()
-        for (i: Float in output.array()) {
-          arrayData.add(i.toDouble())
+        if (enableTensor) {
+          val bmpFrameResult = ImageConvertUtils.getInstance().getUpRightBitmap(image)
+          val bmpFaceResult =
+            Bitmap.createBitmap(
+              TF_OD_API_INPUT_SIZE,
+              TF_OD_API_INPUT_SIZE,
+              Bitmap.Config.ARGB_8888
+            )
+          val faceBB = RectF(face.boundingBox)
+          val cvFace = Canvas(bmpFaceResult)
+          val sx = TF_OD_API_INPUT_SIZE.toFloat() / faceBB.width()
+          val sy = TF_OD_API_INPUT_SIZE.toFloat() / faceBB.height()
+          val matrix = Matrix()
+          matrix.postTranslate(-faceBB.left, -faceBB.top)
+          matrix.postScale(sx, sy)
+          cvFace.drawBitmap(bmpFrameResult, matrix, null)
+          val input: ByteBuffer = FaceHelper().bitmap2ByteBuffer(bmpFaceResult)
+          val output: FloatBuffer = FloatBuffer.allocate(192)
+          interpreter?.run(input, output)
+
+          for (i: Float in output.array()) {
+            arrayData.add(i.toDouble())
+          }
+          map["data"] = arrayData
+        } else {
+          map["data"] = arrayData
         }
-        val map: MutableMap<String, Any> = HashMap()
+
         if (runLandmarks) {
           map["landmarks"] = processLandmarks(
             face,
@@ -346,7 +359,6 @@ class VisionCameraFaceDetectionPlugin(
           scaleX,
           scaleY
         )
-        map["data"] = arrayData
         result.add(map)
       }
     } catch (e: Exception) {

package/ios/VisionCameraFaceDetectionPlugin.swift

@@ -20,6 +20,7 @@ public class VisionCameraFaceDetectionPlugin: FrameProcessorPlugin {
     private var runClassifications = false
     private var runContours = false
     private var trackingEnabled = false
+    private var enableTensor = false
     
     public override init(
         proxy: VisionCameraProxyHolder,
@@ -30,6 +31,9 @@ public class VisionCameraFaceDetectionPlugin: FrameProcessorPlugin {
         
         // handle auto scaling
         autoScale = config?["autoScale"] as? Bool == true
+
+        // handle enable/disable tensor
+        enableTensor = config?["enableTensor"] as? Bool == true
         
         // initializes faceDetector on creation
         let minFaceSize = 0.15
@@ -268,26 +272,30 @@ public class VisionCameraFaceDetectionPlugin: FrameProcessorPlugin {
             let faces: [Face] = try faceDetector!.results(in: image)
             for face in faces {
                 var map: [String: Any] = [:]
-                guard let imageCrop = FaceHelper.getImageFaceFromBuffer(from: frame.buffer, rectImage: face.frame, orientation: orientation) else {
-                    return nil
-                }
-                guard let pixelBuffer = FaceHelper.uiImageToPixelBuffer(image: imageCrop, size: inputWidth) else {
-                    return nil
-                }
-                guard let rgbData = FaceHelper.rgbDataFromBuffer(
-                    pixelBuffer,
-                    byteCount: batchSize * inputWidth * inputHeight * inputChannels,
-                    isModelQuantized: false
-                ) else {
-                    return nil
-                }
-                try interpreter?.copy(rgbData, toInputAt: 0)
-                try interpreter?.invoke()
-                let outputTensor: Tensor? = try interpreter?.output(at: 0)
-                
-                if ((outputTensor?.data) != nil) {
-                    let result: [Float] = [Float32](unsafeData: outputTensor!.data) ?? []
-                    map["data"] = result
+                if enableTensor {
+                    guard let imageCrop = FaceHelper.getImageFaceFromBuffer(from: frame.buffer, rectImage: face.frame, orientation: orientation) else {
+                        return nil
+                    }
+                    guard let pixelBuffer = FaceHelper.uiImageToPixelBuffer(image: imageCrop, size: inputWidth) else {
+                        return nil
+                    }
+                    guard let rgbData = FaceHelper.rgbDataFromBuffer(
+                        pixelBuffer,
+                        byteCount: batchSize * inputWidth * inputHeight * inputChannels,
+                        isModelQuantized: false
+                    ) else {
+                        return nil
+                    }
+                    try interpreter?.copy(rgbData, toInputAt: 0)
+                    try interpreter?.invoke()
+                    let outputTensor: Tensor? = try interpreter?.output(at: 0)
+                    
+                    if ((outputTensor?.data) != nil) {
+                        let result: [Float] = [Float32](unsafeData: outputTensor!.data) ?? []
+                        map["data"] = result
+                    } else {
+                        map["data"] = []
+                    }
                 } else {
                     map["data"] = []
                 }

package/lib/commonjs/FaceDetector.cjs.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeVisionCamera","createFaceDetectorPlugin","options","plugin","VisionCameraProxy","initFrameProcessorPlugin","Error","detectFaces","frame","call","useFaceDetector","useMemo"],"sourceRoot":"../../src","sources":["FaceDetector.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,wBAAA,GAAAD,OAAA;AA0HA;AACA;AACA;AACA;AACA;AACA;AACA,SAASE,wBAAwBA,CAC/BC,OAA8B,EACV;EACpB,MAAMC,MAAM,GAAGC,0CAAiB,CAACC,wBAAwB,CAAC,aAAa,EAAE;IACvE,GAAGH;EACL,CAAC,CAAC;EAEF,IAAI,CAACC,MAAM,EAAE;IACX,MAAM,IAAIG,KAAK,CAAC,sDAAsD,CAAC;EACzE;EAEA,OAAO;IACLC,WAAW,EAAGC,KAAY,IAAa;MACrC,SAAS;;MACT;MACA,OAAOL,MAAM,CAACM,IAAI,CAACD,KAAK,CAAC;IAC3B;EACF,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASE,eAAeA,CAC7BR,OAA8B,EACV;EACpB,OAAO,IAAAS,cAAO,EAAC,MAAMV,wBAAwB,CAACC,OAAO,CAAC,EAAE,CAACA,OAAO,CAAC,CAAC;AACpE","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeVisionCamera","createFaceDetectorPlugin","options","plugin","VisionCameraProxy","initFrameProcessorPlugin","Error","detectFaces","frame","call","useFaceDetector","useMemo"],"sourceRoot":"../../src","sources":["FaceDetector.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,wBAAA,GAAAD,OAAA;AA+HA;AACA;AACA;AACA;AACA;AACA;AACA,SAASE,wBAAwBA,CAC/BC,OAA8B,EACV;EACpB,MAAMC,MAAM,GAAGC,0CAAiB,CAACC,wBAAwB,CAAC,aAAa,EAAE;IACvE,GAAGH;EACL,CAAC,CAAC;EAEF,IAAI,CAACC,MAAM,EAAE;IACX,MAAM,IAAIG,KAAK,CAAC,sDAAsD,CAAC;EACzE;EAEA,OAAO;IACLC,WAAW,EAAGC,KAAY,IAAa;MACrC,SAAS;;MACT;MACA,OAAOL,MAAM,CAACM,IAAI,CAACD,KAAK,CAAC;IAC3B;EACF,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASE,eAAeA,CAC7BR,OAA8B,EACV;EACpB,OAAO,IAAAS,cAAO,EAAC,MAAMV,wBAAwB,CAACC,OAAO,CAAC,EAAE,CAACA,OAAO,CAAC,CAAC;AACpE","ignoreList":[]}

package/lib/module/FaceDetector.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","VisionCameraProxy","createFaceDetectorPlugin","options","plugin","initFrameProcessorPlugin","Error","detectFaces","frame","call","useFaceDetector"],"sourceRoot":"../../src","sources":["FaceDetector.ts"],"mappings":"AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,iBAAiB,QAAoB,4BAA4B;AA0H1E;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,wBAAwBA,CAC/BC,OAA8B,EACV;EACpB,MAAMC,MAAM,GAAGH,iBAAiB,CAACI,wBAAwB,CAAC,aAAa,EAAE;IACvE,GAAGF;EACL,CAAC,CAAC;EAEF,IAAI,CAACC,MAAM,EAAE;IACX,MAAM,IAAIE,KAAK,CAAC,sDAAsD,CAAC;EACzE;EAEA,OAAO;IACLC,WAAW,EAAGC,KAAY,IAAa;MACrC,SAAS;;MACT;MACA,OAAOJ,MAAM,CAACK,IAAI,CAACD,KAAK,CAAC;IAC3B;EACF,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,eAAeA,CAC7BP,OAA8B,EACV;EACpB,OAAOH,OAAO,CAAC,MAAME,wBAAwB,CAACC,OAAO,CAAC,EAAE,CAACA,OAAO,CAAC,CAAC;AACpE","ignoreList":[]}
+{"version":3,"names":["useMemo","VisionCameraProxy","createFaceDetectorPlugin","options","plugin","initFrameProcessorPlugin","Error","detectFaces","frame","call","useFaceDetector"],"sourceRoot":"../../src","sources":["FaceDetector.ts"],"mappings":"AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,iBAAiB,QAAoB,4BAA4B;AA+H1E;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,wBAAwBA,CAC/BC,OAA8B,EACV;EACpB,MAAMC,MAAM,GAAGH,iBAAiB,CAACI,wBAAwB,CAAC,aAAa,EAAE;IACvE,GAAGF;EACL,CAAC,CAAC;EAEF,IAAI,CAACC,MAAM,EAAE;IACX,MAAM,IAAIE,KAAK,CAAC,sDAAsD,CAAC;EACzE;EAEA,OAAO;IACLC,WAAW,EAAGC,KAAY,IAAa;MACrC,SAAS;;MACT;MACA,OAAOJ,MAAM,CAACK,IAAI,CAACD,KAAK,CAAC;IAC3B;EACF,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,eAAeA,CAC7BP,OAA8B,EACV;EACpB,OAAOH,OAAO,CAAC,MAAME,wBAAwB,CAACC,OAAO,CAAC,EAAE,CAACA,OAAO,CAAC,CAAC;AACpE","ignoreList":[]}

package/lib/typescript/src/FaceDetector.d.ts

@@ -105,6 +105,10 @@ export interface FaceDetectionOptions {
      * @default false
      */
     autoScale?: boolean;
+    /**
+     * for enable/disable tensorflow lite logic, just face detection
+     */
+    enableTensor?: boolean;
 }
 /**
  * Use an instance of face detector plugin.

package/lib/typescript/src/FaceDetector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FaceDetector.d.ts","sourceRoot":"","sources":["../../../src/FaceDetector.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,KAAK,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAE3E,KAAK,kBAAkB,GAAG;IACxB;;;;OAIG;IACH,WAAW,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,EAAE,CAAC;CACvC,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,MAAM,WAAW,IAAI;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,GAAG,CAAC;CACX;AAED,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,KAAK,EAAE,CAAC;IACd,gBAAgB,EAAE,KAAK,EAAE,CAAC;IAC1B,mBAAmB,EAAE,KAAK,EAAE,CAAC;IAC7B,iBAAiB,EAAE,KAAK,EAAE,CAAC;IAC3B,oBAAoB,EAAE,KAAK,EAAE,CAAC;IAC9B,QAAQ,EAAE,KAAK,EAAE,CAAC;IAClB,SAAS,EAAE,KAAK,EAAE,CAAC;IACnB,aAAa,EAAE,KAAK,EAAE,CAAC;IACvB,gBAAgB,EAAE,KAAK,EAAE,CAAC;IAC1B,aAAa,EAAE,KAAK,EAAE,CAAC;IACvB,gBAAgB,EAAE,KAAK,EAAE,CAAC;IAC1B,WAAW,EAAE,KAAK,EAAE,CAAC;IACrB,WAAW,EAAE,KAAK,EAAE,CAAC;IACrB,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB,WAAW,EAAE,KAAK,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,KAAK,CAAC;IAClB,QAAQ,EAAE,KAAK,CAAC;IAChB,QAAQ,EAAE,KAAK,CAAC;IAChB,YAAY,EAAE,KAAK,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC;IAClB,WAAW,EAAE,KAAK,CAAC;IACnB,SAAS,EAAE,KAAK,CAAC;IACjB,WAAW,EAAE,KAAK,CAAC;IACnB,SAAS,EAAE,KAAK,CAAC;IACjB,SAAS,EAAE,KAAK,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAEtC;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAE9B;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAE7B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAEpC;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AA4BD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,kBAAkB,CAEpB"}
+{"version":3,"file":"FaceDetector.d.ts","sourceRoot":"","sources":["../../../src/FaceDetector.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,KAAK,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAE3E,KAAK,kBAAkB,GAAG;IACxB;;;;OAIG;IACH,WAAW,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,EAAE,CAAC;CACvC,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,MAAM,WAAW,IAAI;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,GAAG,CAAC;CACX;AAED,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,KAAK,EAAE,CAAC;IACd,gBAAgB,EAAE,KAAK,EAAE,CAAC;IAC1B,mBAAmB,EAAE,KAAK,EAAE,CAAC;IAC7B,iBAAiB,EAAE,KAAK,EAAE,CAAC;IAC3B,oBAAoB,EAAE,KAAK,EAAE,CAAC;IAC9B,QAAQ,EAAE,KAAK,EAAE,CAAC;IAClB,SAAS,EAAE,KAAK,EAAE,CAAC;IACnB,aAAa,EAAE,KAAK,EAAE,CAAC;IACvB,gBAAgB,EAAE,KAAK,EAAE,CAAC;IAC1B,aAAa,EAAE,KAAK,EAAE,CAAC;IACvB,gBAAgB,EAAE,KAAK,EAAE,CAAC;IAC1B,WAAW,EAAE,KAAK,EAAE,CAAC;IACrB,WAAW,EAAE,KAAK,EAAE,CAAC;IACrB,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB,WAAW,EAAE,KAAK,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,KAAK,CAAC;IAClB,QAAQ,EAAE,KAAK,CAAC;IAChB,QAAQ,EAAE,KAAK,CAAC;IAChB,YAAY,EAAE,KAAK,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC;IAClB,WAAW,EAAE,KAAK,CAAC;IACnB,SAAS,EAAE,KAAK,CAAC;IACjB,WAAW,EAAE,KAAK,CAAC;IACnB,SAAS,EAAE,KAAK,CAAC;IACjB,SAAS,EAAE,KAAK,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAEtC;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAE9B;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAE7B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAEpC;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AA4BD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,kBAAkB,CAEpB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vision-camera-face-detection",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Plugin Face Detection for Vision Camera 4",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.cjs",

package/src/FaceDetector.ts

@@ -119,6 +119,11 @@ export interface FaceDetectionOptions {
    * @default false
    */
   autoScale?: boolean;
+
+  /**
+   * for enable/disable tensorflow lite logic, just face detection
+   */
+  enableTensor?: boolean;
 }
 
 /**