From 1baf72e46b3c38cb3b39093ccf13aa577a5a5f15 Mon Sep 17 00:00:00 2001
From: Sebastian Schmidt <mrschmidt@google.com>
Date: Wed, 24 May 2023 23:42:59 -0700
Subject: [PATCH] Internal change

PiperOrigin-RevId: 535131938
---
 .../vision/face_landmarker/face_landmarker.ts | 22 ++++++++++---------
 .../face_landmarker_result.d.ts               |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/mediapipe/tasks/web/vision/face_landmarker/face_landmarker.ts b/mediapipe/tasks/web/vision/face_landmarker/face_landmarker.ts
index 9dc8626c9..e2e25c71b 100644
--- a/mediapipe/tasks/web/vision/face_landmarker/face_landmarker.ts
+++ b/mediapipe/tasks/web/vision/face_landmarker/face_landmarker.ts
@@ -59,7 +59,11 @@ const DEFAULT_SCORE_THRESHOLD = 0.5;
  * This API expects a pre-trained face landmarker model asset bundle.
  */
 export class FaceLandmarker extends VisionTaskRunner {
-  private result: FaceLandmarkerResult = {faceLandmarks: []};
+  private result: FaceLandmarkerResult = {
+    faceLandmarks: [],
+    faceBlendshapes: [],
+    facialTransformationMatrixes: []
+  };
   private outputFaceBlendshapes = false;
   private outputFacialTransformationMatrixes = false;
 
@@ -256,13 +260,11 @@ export class FaceLandmarker extends VisionTaskRunner {
   }
 
   private resetResults(): void {
-    this.result = {faceLandmarks: []};
-    if (this.outputFaceBlendshapes) {
-      this.result.faceBlendshapes = [];
-    }
-    if (this.outputFacialTransformationMatrixes) {
-      this.result.facialTransformationMatrixes = [];
-    }
+    this.result = {
+      faceLandmarks: [],
+      faceBlendshapes: [],
+      facialTransformationMatrixes: []
+    };
   }
 
   /** Sets the default values for the graph. */
@@ -286,7 +288,7 @@ export class FaceLandmarker extends VisionTaskRunner {
 
   /** Adds new blendshapes from the given proto. */
   private addBlenshape(data: Uint8Array[]): void {
-    if (!this.result.faceBlendshapes) {
+    if (!this.outputFaceBlendshapes) {
       return;
     }
 
@@ -300,7 +302,7 @@ export class FaceLandmarker extends VisionTaskRunner {
 
   /** Adds new transformation matrixes from the given proto. */
   private addFacialTransformationMatrixes(data: Uint8Array[]): void {
-    if (!this.result.facialTransformationMatrixes) {
+    if (!this.outputFacialTransformationMatrixes) {
       return;
     }
 
diff --git a/mediapipe/tasks/web/vision/face_landmarker/face_landmarker_result.d.ts b/mediapipe/tasks/web/vision/face_landmarker/face_landmarker_result.d.ts
index 4bbe3b0c9..4af483ab3 100644
--- a/mediapipe/tasks/web/vision/face_landmarker/face_landmarker_result.d.ts
+++ b/mediapipe/tasks/web/vision/face_landmarker/face_landmarker_result.d.ts
@@ -29,8 +29,8 @@ export declare interface FaceLandmarkerResult {
   faceLandmarks: NormalizedLandmark[][];
 
   /** Optional face blendshapes results. */
-  faceBlendshapes?: Classifications[];
+  faceBlendshapes: Classifications[];
 
   /** Optional facial transformation matrix. */
-  facialTransformationMatrixes?: Matrix[];
+  facialTransformationMatrixes: Matrix[];
 }