shared-ritm 1.2.121 → 1.2.122

package/dist/types/utils/faceApiHelper.d.ts

@@ -28,9 +28,9 @@ declare class FaceApiHelper {
     } | null;
     setStylesForCanvas(canvasContainer: any): void;
     checkFaceInclusion(frame: any, face: any): boolean;
-    getFaceDetections(videoRef: any): Promise<faceapi.WithFaceExpressions<faceapi.WithFaceLandmarks<{
+    getFaceDetections(videoRef: any, inputSize: number): Promise<never[] | faceapi.WithFaceLandmarks<{
         detection: faceapi.FaceDetection;
-    }, faceapi.FaceLandmarks68>>[]>;
+    }> | undefined>;
     getCanvas(videoRef: any): HTMLCanvasElement;
     getResizedAndDetection(canvas: any, detections: any, ctx: any, videoWidth: number, videoHeight: number): void;
     getFaceSnapshot(inputImage: any, box: any): Promise<string | null>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shared-ritm",
-  "version": "1.2.121",
+  "version": "1.2.122",
   "private": false,
   "files": [
     "dist",

package/src/utils/faceApiHelper.ts

@@ -71,12 +71,10 @@ class FaceApiHelper {
     return faceXmin >= frameXmin && faceXmax <= frameXmax && faceYmin >= frameYmin && faceYmax <= frameYmax
   }
 
-  async getFaceDetections(videoRef: any) {
+  async getFaceDetections(videoRef: any, inputSize: number) {
     if (!videoRef) return []
-    return faceapi
-      .detectAllFaces(videoRef, new faceapi.TinyFaceDetectorOptions())
-      .withFaceLandmarks()
-      .withFaceExpressions()
+    const options = new faceapi.TinyFaceDetectorOptions({ inputSize })
+    return faceapi.detectSingleFace(videoRef, options).withFaceLandmarks(true)
   }
 
   getCanvas(videoRef: any) {
@@ -95,7 +93,7 @@ class FaceApiHelper {
 
     faceapi.draw.drawDetections(canvas, resized)
     faceapi.draw.drawFaceLandmarks(canvas, resized)
-    faceapi.draw.drawFaceExpressions(canvas, resized)
+    //faceapi.draw.drawFaceExpressions(canvas, resized)
   }
 
   async getFaceSnapshot(inputImage: any, box: any) {
@@ -116,10 +114,7 @@ class FaceApiHelper {
     try {
       await Promise.all([
         faceapi.nets.tinyFaceDetector.loadFromUri('/models'),
-        faceapi.nets.faceLandmark68Net.loadFromUri('/models'),
-        faceapi.nets.faceRecognitionNet.loadFromUri('/models'),
-        faceapi.nets.faceExpressionNet.loadFromUri('/models'),
-        //faceapi.nets.ssdMobilenetv1.loadFromUri('/models'),
+        faceapi.nets.faceLandmark68TinyNet.loadFromUri('/models'),
       ])
     } catch (error) {
       console.error(error)