Entry Js PUBLISH by v3.20230925.943

entrylabs · Sep 25, 2023 · 8c60207 · 8c60207
1 parent 3a7e3c5
commit 8c60207
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/dist/entry.js b/dist/entry.js
@@ -10681,6 +10681,7 @@ var MediaPipeUtils = /** @class */ (function () {
         this.isInitPoseLandmarker = false;
         this.alreadyInitPoseLandmarkerOffscreenCanvas = false;
         this.isPrevFaceLandmarker = false;
+        this.isRunWorkerFaceLandmarker = false;
         this.isRunningFaceLandmarker = false;
         this.isDrawDetectedFaceLandmarker = false;
         this.isInitFaceLandmarker = false;
@@ -11292,6 +11293,12 @@ var MediaPipeUtils = /** @class */ (function () {
                 }
                 _this.sendImageBitmapForFaceLandmarker();
             }
+            else if (data.action === 'run_start_face_landmarker') {
+                _this.isRunWorkerFaceLandmarker = true;
+            }
+            else if (data.action === 'run_stop_face_landmarker') {
+                _this.isRunWorkerFaceLandmarker = false;
+            }
             else if (data.action === 'start_face_landmarker') {
                 _this.isPrevFaceLandmarker = true;
                 Entry.engine.fireEvent('when_face_landmarker');
@@ -11548,7 +11555,7 @@ var MediaPipeUtils = /** @class */ (function () {
                             }, [this.faceLandmarkerOffscreenCanvas]);
                             this.alreadyInitFaceLandmarkerOffscreenCanvas = true;
                         }
-                        else {
+                        else if (!this.isRunWorkerFaceLandmarker) {
                             this.faceLandmarkerWorker.postMessage({
                                 action: 'face_landmarker_restart',
                             });
@@ -11721,6 +11728,7 @@ var MediaPipeUtils = /** @class */ (function () {
                 });
                 this.isRunningFaceLandmarker = false;
                 this.isPrevFaceLandmarker = false;
+                this.isRunWorkerFaceLandmarker = false;
                 this.countDetectedFace = 0;
                 return [2 /*return*/];
             });

diff --git a/dist/entry.min.js b/dist/entry.min.js
diff --git a/extern/face-landmarker.worker.js b/extern/face-landmarker.worker.js
@@ -85,12 +85,14 @@ const drawOption = {
 
 let flipState;
 let isRun = false;
+let isFirstIdle = false;
 
 self.onmessage = async ({ data }) => {
     if (data.action === 'face_landmarker_init') {
         initializeFaceLandmarker(data);
     } else if (data.action === 'face_landmarker_restart') {
         isRun = true;
+        self.postMessage({ action: 'run_start_face_landmarker' });
     } else if (data.action === 'face_landmarker_change_option') {
         changeFaceLandmarkerOption(data.option);
     } else if (data.action === 'face_landmarker') {
@@ -113,7 +115,6 @@ let isDrawDetectedFaceLandmarker = false;
 
 const initializeFaceLandmarker = async (data) => {
     const { canvas, option, isSafari, lang } = data;
-    isRun = true;
     faceLang = lang.face;
     isDrawDetectedFaceLandmarker = option.isDrawDetectedFaceLandmarker;
     offCanvas = canvas;
@@ -125,7 +126,11 @@ const initializeFaceLandmarker = async (data) => {
     }
 
     if (!human) human = new Human.default(config);
+    await human.load(); // optional as models would be loaded on-demand first time they are required
+    await human.warmup(); // optional as model warmup is performed on-demand first time its executed
 
+    isRun = true;
+    self.postMessage({ action: 'run_start_face_landmarker' });
     self.postMessage({ action: 'next_face_landmarker' });
 };
 
@@ -166,10 +171,13 @@ const predictFaceLandmarker = async (imageBitmap) => {
         if (!workerContext || !human) {
             return;
         }
-        const results = await human.detect(imageBitmap);
-        if (!isRun) {
+        if (!isFirstIdle && human.state === 'idle') {
+            isFirstIdle = true;
+        }
+        if (!isRun || !isFirstIdle) {
             return;
         }
+        const results = await human.detect(imageBitmap);
         workerContext.save();
         workerContext.clearRect(0, 0, 640, 360);
 
@@ -220,6 +228,7 @@ const predictFaceLandmarker = async (imageBitmap) => {
 const clearPredictFaceLandmarker = () => {
     console.log('clearPredictFaceLandmarker');
     isRun = false;
+    self.postMessage({ action: 'run_stop_face_landmarker' });
     isPrevFaceLandmarker = false;
     countDetectedFace = 0;
     workerContext.clearRect(0, 0, 640, 360);