@webex/ladon-ts 4.3.0 → 4.5.0

package/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [4.5.0](https://github.com/beyonddunbar/ladon-ts/compare/v4.4.0...v4.5.0) (2024-10-22)
+
+
+### Features
+
+* mask and frame syncing ([#13](https://github.com/beyonddunbar/ladon-ts/issues/13)) ([8a08404](https://github.com/beyonddunbar/ladon-ts/commit/8a08404afaf1479b82cd403ac45a3ecac64e94a1))
+
+
+### Bug Fixes
+
+* lint ([6a05d3d](https://github.com/beyonddunbar/ladon-ts/commit/6a05d3d3f36e4d631f5e87530d654645c536bc57))
+
+## [4.4.0](https://github.com/beyonddunbar/ladon-ts/compare/v4.3.0...v4.4.0) (2024-09-03)
+
+
+### Features
+
+* 0.7.7.1 model updates and mask edge fix ([#12](https://github.com/beyonddunbar/ladon-ts/issues/12)) ([00c5584](https://github.com/beyonddunbar/ladon-ts/commit/00c5584b6f2f86803ddb70027c010d2ef00f79db))
+
+
+### Bug Fixes
+
+* lint ([e19d2de](https://github.com/beyonddunbar/ladon-ts/commit/e19d2de5146da979dcba82b659ab2802b9c8ea49))
+
 ## [4.3.0](https://github.com/beyonddunbar/ladon-ts/compare/v4.2.4...v4.3.0) (2024-03-25)
 
 

package/build/module/lib/config.d.ts

@@ -2,8 +2,22 @@ export declare const BASE_URL = "https://models.intelligence.webex.com/ladon";
 export declare const LOCAL_BASE_URL = "https://localhost";
 export declare const LOCAL_WORKER_URI = "/segmentation.js";
 export declare const LOCAL_PORT = 1235;
-export declare const MODEL_VERSION = "1.0.0";
+export declare const MODEL_VERSION = "0.7.7.1";
 export declare const WASM_URI = "/wasm/1.15.1b/";
+export declare enum Quality {
+    TINY = "TINY",
+    LOW = "LOW",
+    MEDIUM = "MEDIUM",
+    HIGH = "HIGH",
+    ULTRA = "ULTRA"
+}
+export declare enum BlurStrength {
+    WEAK = "WEAK",
+    MODERATE = "MODERATE",
+    STRONG = "STRONG",
+    STRONGER = "STRONGER",
+    STRONGEST = "STRONGEST"
+}
 export declare type SizeConfig = {
     readonly height: number;
     readonly width: number;
@@ -34,10 +48,12 @@ export declare type BaseMaskConfig = {
     readonly worker_uri: string;
     readonly input_size?: SizeConfig;
     readonly output_size?: SizeConfig;
+    readonly upscaled_size?: SizeConfig;
 };
 export declare type MaskConfig = BaseMaskConfig & {
     readonly input_size: SizeConfig;
     readonly output_size: SizeConfig;
+    readonly upscaled_size: SizeConfig;
 };
 export declare type PreloadConfig = {
     readonly base_url?: string;
@@ -51,20 +67,6 @@ export declare type PipelineConfig = {
     readonly input: InputConfig;
     readonly mask: MaskConfig;
 };
-export declare enum Quality {
-    TINY = "TINY",
-    LOW = "LOW",
-    MEDIUM = "MEDIUM",
-    HIGH = "HIGH",
-    ULTRA = "ULTRA"
-}
-export declare enum BlurStrength {
-    WEAK = "WEAK",
-    MODERATE = "MODERATE",
-    STRONG = "STRONG",
-    STRONGER = "STRONGER",
-    STRONGEST = "STRONGEST"
-}
 export declare const getBlurConfig: (blur_strength: BlurStrength, horizontal_mirror?: boolean) => BlurConfig;
 export declare const getPreloadConfig: (quality?: Quality, generator?: Generator, model_url_resolver?: ModelUrlResolver, base_url?: string, useLocalWorker?: boolean) => {
     mask: {
@@ -76,6 +78,7 @@ export declare const getPreloadConfig: (quality?: Quality, generator?: Generator
         worker_uri: string;
         input_size?: SizeConfig | undefined;
         output_size?: SizeConfig | undefined;
+        upscaled_size?: SizeConfig | undefined;
     };
     base_url?: string | undefined;
     wasm_uri?: string | undefined;
@@ -89,6 +92,7 @@ export declare const getConfig: (height: number, width: number, quality?: Qualit
     mask: {
         input_size: SizeConfig;
         output_size: SizeConfig;
+        upscaled_size: SizeConfig;
         generator: Generator;
         generation_interval_ms: number;
         model_rank: number;

package/build/module/lib/config.js

@@ -4,7 +4,7 @@ export const BASE_URL = 'https://models.intelligence.webex.com/ladon';
 export const LOCAL_BASE_URL = 'https://localhost';
 export const LOCAL_WORKER_URI = '/segmentation.js';
 export const LOCAL_PORT = 1235;
-export const MODEL_VERSION = '1.0.0';
+export const MODEL_VERSION = '0.7.7.1';
 export const WASM_URI = '/wasm/1.15.1b/';
 export var Quality;
 (function (Quality) {
@@ -68,12 +68,15 @@ export const getPreloadConfig = (quality = Quality.LOW, generator = 'local', mod
         base_url,
         wasm_uri: WASM_URI,
         mask: {
-            generation_interval_ms: 48,
             generator,
+            generation_interval_ms: 48,
+            model_uri: `/models/${model_version}/tiny-256x144-256x144.onnx`,
+            input_size: { height: 144, width: 256 },
+            output_size: { height: 144, width: 256 },
+            upscaled_size: { height: 360, width: 640 },
+            model_rank: 4,
             model_url_resolver,
-            model_uri: `/models/${model_version}/mv2_dlv3plus_dynamic_dev_plus_dual_op11_mn3sm100.onnx`,
             worker_uri,
-            model_rank: 3,
         },
     };
     let mask_quality_config = {};
@@ -81,34 +84,51 @@ export const getPreloadConfig = (quality = Quality.LOW, generator = 'local', mod
         case Quality.TINY:
             mask_quality_config = {
                 generation_interval_ms: 48,
-                model_uri: `/models/${model_version}/tiny_model.onnx`,
+                model_uri: `/models/${model_version}/tiny-256x144-256x144.onnx`,
                 input_size: { height: 144, width: 256 },
-                output_size: { height: 360, width: 640 },
+                output_size: { height: 144, width: 256 },
+                upscaled_size: { height: 144, width: 256 },
                 model_rank: 4,
             };
             break;
         case Quality.LOW:
             mask_quality_config = {
                 generation_interval_ms: 48,
-                model_uri: `/models/${model_version}/mv2_dlv3plus_dynamic_dev_plus_dual_op11_mn3sm100.onnx`,
+                model_uri: `/models/${model_version}/low-256x144-256x144.onnx`,
+                input_size: { height: 144, width: 256 },
+                output_size: { height: 144, width: 256 },
+                upscaled_size: { height: 360, width: 640 },
+                model_rank: 4,
             };
             break;
         case Quality.MEDIUM:
             mask_quality_config = {
                 generation_interval_ms: 24,
-                model_uri: `/models/${model_version}/mv2_dlv3plus_dynamic_dev_plus_dual_op11_mn3sm100.onnx`,
+                model_uri: `/models/${model_version}/medium-256x144-256x144.onnx`,
+                input_size: { height: 144, width: 256 },
+                output_size: { height: 144, width: 256 },
+                upscaled_size: { height: 360, width: 640 },
+                model_rank: 4,
             };
             break;
         case Quality.HIGH:
             mask_quality_config = {
                 generation_interval_ms: 36,
-                model_uri: `/models/${model_version}/mv2_dlv3plus_dynamic_dev_plus_dual_op11_full_depth_2.onnx`,
+                model_uri: `/models/${model_version}/medium-640x360-256x144.onnx`,
+                input_size: { height: 360, width: 640 },
+                output_size: { height: 360, width: 640 },
+                upscaled_size: { height: 360, width: 640 },
+                model_rank: 4,
             };
             break;
         case Quality.ULTRA:
             mask_quality_config = {
                 generation_interval_ms: 0,
-                model_uri: `/models/${model_version}/mv2_dlv3plus_dynamic_dev_plus_dual_op11_full_depth_2.onnx`,
+                model_uri: `/models/${model_version}/medium-640x360-256x144.onnx`,
+                input_size: { height: 360, width: 640 },
+                output_size: { height: 360, width: 640 },
+                upscaled_size: { height: 360, width: 640 },
+                model_rank: 4,
             };
             break;
         default:
@@ -126,6 +146,6 @@ export const getConfig = (height, width, quality = Quality.LOW, generator = 'loc
     const maskConfig = basePreloadConfig.mask;
     return Object.assign(Object.assign({}, basePreloadConfig), { render: renderConfig, input: { height, width }, mask: Object.assign(Object.assign({}, maskConfig), { 
             // Need to ensure we don't override the tiny model's input and output sizes.
-            input_size: maskConfig.input_size || { height, width }, output_size: maskConfig.output_size || { height, width } }) });
+            input_size: maskConfig.input_size || { height, width }, output_size: maskConfig.output_size || { height, width }, upscaled_size: maskConfig.upscaled_size || { height, width } }) });
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUN2QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRXhDLE1BQU0sQ0FBQyxNQUFNLFFBQVEsR0FBRyw2Q0FBNkMsQ0FBQztBQUN0RSxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQUcsbUJBQW1CLENBQUM7QUFDbEQsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsa0JBQWtCLENBQUM7QUFDbkQsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQztBQUMvQixNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDO0FBQ3JDLE1BQU0sQ0FBQyxNQUFNLFFBQVEsR0FBRyxnQkFBZ0IsQ0FBQztBQWdFekMsTUFBTSxDQUFOLElBQVksT0FNWDtBQU5ELFdBQVksT0FBTztJQUNmLHdCQUFhLENBQUE7SUFDYixzQkFBVyxDQUFBO0lBQ1gsNEJBQWlCLENBQUE7SUFDakIsd0JBQWEsQ0FBQTtJQUNiLDBCQUFlLENBQUE7QUFDbkIsQ0FBQyxFQU5XLE9BQU8sS0FBUCxPQUFPLFFBTWxCO0FBRUQsTUFBTSxDQUFOLElBQVksWUFNWDtBQU5ELFdBQVksWUFBWTtJQUNwQiw2QkFBYSxDQUFBO0lBQ2IscUNBQXFCLENBQUE7SUFDckIsaUNBQWlCLENBQUE7SUFDakIscUNBQXFCLENBQUE7SUFDckIsdUNBQXVCLENBQUE7QUFDM0IsQ0FBQyxFQU5XLFlBQVksS0FBWixZQUFZLFFBTXZCO0FBRUQsTUFBTSxDQUFDLE1BQU0sYUFBYSxHQUFHLENBQ3pCLGFBQTJCLEVBQzNCLGlCQUEyQixFQUNqQixFQUFFO0lBQ1osSUFBSSxXQUFXLEdBQUcsRUFBRSxDQUFDO0lBQ3JCLElBQUksS0FBSyxHQUFHLEVBQUUsQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUN2QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRXhDLE1BQU0sQ0FBQyxNQUFNLFFBQVEsR0FBRyw2Q0FBNkMsQ0FBQztBQUN0RSxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQUcsbUJBQW1CLENBQUM7QUFDbEQsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsa0JBQWtCLENBQUM7QUFDbkQsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQztBQUMvQixNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsU0FBUyxDQUFDO0FBQ3ZDLE1BQU0sQ0FBQyxNQUFNLFFBQVEsR0FBRyxnQkFBZ0IsQ0FBQztBQUV6QyxNQUFNLENBQU4sSUFBWSxPQU1YO0FBTkQsV0FBWSxPQUFPO0lBQ2Ysd0JBQWEsQ0FBQTtJQUNiLHNCQUFXLENBQUE7SUFDWCw0QkFBaUIsQ0FBQTtJQUNqQix3QkFBYSxDQUFBO0lBQ2IsMEJBQWUsQ0FBQTtBQUNuQixDQUFDLEVBTlcsT0FBTyxLQUFQLE9BQU8sUUFNbEI7QUFFRCxNQUFNLENBQU4sSUFBWSxZQU1YO0FBTkQsV0FBWSxZQUFZO0lBQ3BCLDZCQUFhLENBQUE7SUFDYixxQ0FBcUIsQ0FBQTtJQUNyQixpQ0FBaUIsQ0FBQTtJQUNqQixxQ0FBcUIsQ0FBQTtJQUNyQix1Q0FBdUIsQ0FBQTtBQUMzQixDQUFDLEVBTlcsWUFBWSxLQUFaLFlBQVksUUFNdkI7QUFrRUQsTUFBTSxDQUFDLE1BQU0sYUFBYSxHQUFHLENBQ3pCLGFBQTJCLEVBQzNCLGlCQUEyQixFQUNqQixFQUFFO0lBQ1osSUFBSSxXQUFXLEdBQUcsRUFBRSxDQUFDO0lBQ3JCLElBQUksS0FBSyxHQUFHLEVBQUUsQ0FB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

package/build/module/lib/generator.d.ts

@@ -4,22 +4,31 @@ declare global {
         url: string;
     }
 }
-export interface MaskResult {
+export interface FacesAndLandmarks {
     data: Float32Array;
+    dims: readonly number[];
+}
+export interface LadonOutput {
+    data: Float32Array;
+    facesAndLandmarks: FacesAndLandmarks;
+    gesture: Float32Array;
+    motion: number;
+    timestamp: number;
     warm: boolean;
 }
 export interface MaskGenerator {
-    getMask(input: Uint8ClampedArray): Promise<MaskResult>;
+    getLadonOutput(input: Uint8ClampedArray, timestamp: number): Promise<LadonOutput>;
     load(): Promise<void>;
     isLoaded(): boolean;
-    postRender(input: Uint8ClampedArray): Promise<void>;
+    postRender(input: Uint8ClampedArray, timestamp: number): Promise<void>;
     destroy(): void;
 }
 export declare class LocalGenerator implements MaskGenerator {
     readonly config: PipelineConfig;
-    private last_mask;
-    private mask_model?;
-    private last_mask_generation;
+    private lastResult;
+    private lastMask;
+    private maskModel?;
+    private lastMaskGenerationTime;
     private output?;
     constructor(config: PipelineConfig);
     /**
@@ -32,7 +41,8 @@ export declare class LocalGenerator implements MaskGenerator {
      * @returns {Float32Array} - The processed data
      */
     private preprocess;
-    getMask(input: Uint8ClampedArray): Promise<MaskResult>;
+    getTimeSinceLastGeneration(): number;
+    getLadonOutput(input: Uint8ClampedArray, timestamp: number): Promise<LadonOutput>;
     load(): Promise<void>;
     isLoaded(): boolean;
     postRender(_: Uint8ClampedArray): Promise<void>;
@@ -40,9 +50,9 @@ export declare class LocalGenerator implements MaskGenerator {
 }
 export declare class NullGenerator implements MaskGenerator {
     readonly config: PipelineConfig;
-    private last_mask;
+    private lastMask;
     constructor(config: PipelineConfig);
-    getMask(_: Uint8ClampedArray): Promise<MaskResult>;
+    getLadonOutput(_: Uint8ClampedArray): Promise<LadonOutput>;
     load(): Promise<void>;
     isLoaded(): boolean;
     postRender(_: Uint8ClampedArray): Promise<void>;
@@ -50,13 +60,14 @@ export declare class NullGenerator implements MaskGenerator {
 }
 export declare class WorkerGenerator implements MaskGenerator {
     readonly config: PipelineConfig;
-    private last_mask;
+    private lastMask;
+    private newMask;
     private worker?;
-    private new_mask;
+    private lastResult;
     constructor(config: PipelineConfig);
-    getMask(_: Uint8ClampedArray): Promise<MaskResult>;
+    getLadonOutput(_: Uint8ClampedArray): Promise<LadonOutput>;
     load(): Promise<void>;
     isLoaded(): boolean;
-    postRender(input: Uint8ClampedArray): Promise<void>;
+    postRender(input: Uint8ClampedArray, timestamp: number): Promise<void>;
     destroy(): void;
 }

package/build/module/lib/generator.js

@@ -12,8 +12,16 @@ import { sharedResourceManager } from './shared-resource-manager';
 export class LocalGenerator {
     constructor(config) {
         this.config = config;
-        this.last_mask_generation = 0;
-        this.last_mask = new ort.Tensor('float32', new Float32Array(this.config.mask.output_size.height * this.config.mask.output_size.width), [1, 1, this.config.mask.output_size.height, this.config.mask.output_size.width]);
+        this.lastMaskGenerationTime = 0;
+        this.lastMask = new ort.Tensor('float32', new Float32Array(this.config.mask.output_size.height * this.config.mask.output_size.width), [1, 1, this.config.mask.output_size.height, this.config.mask.output_size.width]);
+        this.lastResult = {
+            data: this.lastMask.data,
+            facesAndLandmarks: { data: new Float32Array(0), dims: [] },
+            gesture: new Float32Array(0),
+            motion: 0,
+            timestamp: 0,
+            warm: false,
+        };
     }
     /**
      * This method preprocesses an input Uint8ClampedArray to a Float32Array
@@ -25,14 +33,14 @@ export class LocalGenerator {
      * @returns {Float32Array} - The processed data
      */
     preprocess(input, alpha) {
+        var _a;
         const { model_rank, input_size, output_size } = this.config.mask;
         const { height, width } = input_size;
         const numImagePixels = height * width;
-        if (!this.output) {
-            this.output = new Float32Array(numImagePixels * model_rank);
-        }
+        // Initialize the output buffer if it is not already set
+        (_a = this.output) !== null && _a !== void 0 ? _a : (this.output = new Float32Array(numImagePixels * model_rank));
         // In-place modification of class-scoped output buffer
-        const channelFlipOffset = model_rank === 4 ? 2 : 0;
+        const channelFlipOffset = 2;
         const numInputPixels = input.length / 4;
         // Loop over all color channels in the image
         for (let channel = 0; channel < 3; channel++) {
@@ -44,63 +52,66 @@ export class LocalGenerator {
                     input[pixel * 4 + Math.abs(channelFlipOffset - channel)];
             }
         }
-        // If the model_rank is 4, an additional alpha channel needs to be set
-        if (model_rank === 4) {
-            // Scaling factors for width and height based on the ratio of output to input sizes
-            const widthScale = output_size.width / width;
-            const heightScale = output_size.height / height;
-            // Iterate over each pixel in the width of the input image
-            for (let x = 0; x < width; x++) {
-                const nearestNeighborX = Math.floor(x * widthScale);
-                // Iterate over each pixel in the height of the input image
-                for (let y = 0; y < height; y++) {
-                    const nearestNeighborY = Math.floor(y * heightScale);
-                    const maskIdx = nearestNeighborX + nearestNeighborY * output_size.width;
-                    const outputIdx = x + y * width + 3 * numImagePixels;
-                    // Normalize the alpha value to range between 0 and 1, and scale it to the range of 0-255
-                    const normalizedValue = Math.min(Math.max(alpha[maskIdx], 0), 1) * 255;
-                    // Assign the normalized value to the output at the computed index
-                    this.output[outputIdx] = normalizedValue;
-                }
+        // Scaling factors for width and height based on the ratio of output to input sizes
+        const widthScale = output_size.width / width;
+        const heightScale = output_size.height / height;
+        // Iterate over each pixel in the width of the input image
+        for (let x = 0; x < width; x++) {
+            const nearestNeighborX = Math.floor(x * widthScale);
+            // Iterate over each pixel in the height of the input image
+            for (let y = 0; y < height; y++) {
+                const nearestNeighborY = Math.floor(y * heightScale);
+                const maskIdx = nearestNeighborX + nearestNeighborY * output_size.width;
+                const outputIdx = x + y * width + 3 * numImagePixels;
+                // Normalize the alpha value to range between 0 and 1, and scale it to the range of 0-255
+                // This step is necessary because the rendering pipeline expects alpha values in the [0, 255] range
+                const normalizedValue = Math.min(Math.max(alpha[maskIdx], 0), 255);
+                // Assign the normalized value to the output at the computed index
+                this.output[outputIdx] = normalizedValue;
             }
         }
         return this.output;
     }
-    getMask(input) {
+    getTimeSinceLastGeneration() {
+        return Date.now() - this.lastMaskGenerationTime;
+    }
+    getLadonOutput(input, timestamp) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.mask_model) {
+            if (!this.maskModel) {
                 throw new Error('[ladon-ts] - mask model not loaded.');
             }
-            const mask_generation_timeout = Date.now() - this.last_mask_generation > this.config.mask.generation_interval_ms;
-            if (!mask_generation_timeout) {
+            if (this.getTimeSinceLastGeneration() < this.config.mask.generation_interval_ms) {
                 return {
-                    data: this.last_mask.data,
+                    data: this.lastMask.data,
+                    facesAndLandmarks: this.lastResult.facesAndLandmarks,
+                    gesture: this.lastResult.gesture,
+                    motion: this.lastResult.motion,
+                    timestamp: this.lastResult.timestamp,
                     warm: false,
                 };
             }
-            this.last_mask_generation = Date.now();
-            const image_tns = new ort.Tensor('float32', this.preprocess(input, this.last_mask.data), [
+            this.lastMaskGenerationTime = Date.now();
+            const imageTensor = new ort.Tensor('float32', this.preprocess(input, this.lastMask.data), [
                 1,
                 this.config.mask.model_rank,
                 this.config.mask.input_size.height,
                 this.config.mask.input_size.width,
             ]);
-            if (this.config.mask.model_rank === 4) {
-                // This feed uses the new model input params for the tiny model.
-                const results = yield this.mask_model.run({ input: image_tns });
-                this.last_mask = results.segmentation;
-            }
-            else {
-                const results = yield this.mask_model.run({
-                    input_image: image_tns,
-                    prev_mask: this.last_mask,
-                });
-                this.last_mask = results.output_mask;
-            }
-            return {
-                data: this.last_mask.data,
+            const results = yield this.maskModel.run({ input: imageTensor });
+            this.lastMask = results.segmentation;
+            this.lastResult = {
+                data: (_a = this.lastMask.data) !== null && _a !== void 0 ? _a : new Float32Array(0),
+                facesAndLandmarks: {
+                    data: (_c = (_b = results.faces_and_landmarks) === null || _b === void 0 ? void 0 : _b.data) !== null && _c !== void 0 ? _c : new Float32Array(0),
+                    dims: (_e = (_d = results.faces_and_landmarks) === null || _d === void 0 ? void 0 : _d.dims) !== null && _e !== void 0 ? _e : [],
+                },
+                gesture: (_g = (_f = results.gesture) === null || _f === void 0 ? void 0 : _f.data) !== null && _g !== void 0 ? _g : new Float32Array(0),
+                motion: (_j = (_h = results.motion) === null || _h === void 0 ? void 0 : _h.data[0]) !== null && _j !== void 0 ? _j : 0,
+                timestamp,
                 warm: true,
             };
+            return this.lastResult;
         });
     }
     load() {
@@ -108,16 +119,16 @@ export class LocalGenerator {
         return __awaiter(this, void 0, void 0, function* () {
             const modelUrl = yield sharedResourceManager.getModelUrl(this.config);
             // Attempt to retrieve a preloaded InferenceSession from the shared resource manager.
-            this.mask_model = sharedResourceManager.getModelSession(modelUrl);
+            this.maskModel = sharedResourceManager.getModelSession(modelUrl);
             // If the model is not preloaded, load it from the provided model URL.
-            (_a = this.mask_model) !== null && _a !== void 0 ? _a : (this.mask_model = yield sharedResourceManager.preloadModel(this.config));
-            if (!this.mask_model) {
+            (_a = this.maskModel) !== null && _a !== void 0 ? _a : (this.maskModel = yield sharedResourceManager.preloadModel(this.config));
+            if (!this.maskModel) {
                 throw new Error('Failed to load the ONNX model.');
             }
         });
     }
     isLoaded() {
-        return !!this.mask_model;
+        return !!this.maskModel;
     }
     /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
     postRender(_) {
@@ -132,13 +143,17 @@ export class LocalGenerator {
 export class NullGenerator {
     constructor(config) {
         this.config = config;
-        this.last_mask = new Float32Array(this.config.mask.output_size.height * this.config.mask.output_size.width);
+        this.lastMask = new Float32Array(this.config.mask.output_size.height * this.config.mask.output_size.width);
     }
     /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
-    getMask(_) {
+    getLadonOutput(_) {
         return __awaiter(this, void 0, void 0, function* () {
             return {
-                data: this.last_mask,
+                data: this.lastMask,
+                facesAndLandmarks: { data: new Float32Array(0), dims: [] },
+                gesture: new Float32Array(0),
+                motion: 0,
+                timestamp: 0,
                 warm: false,
             };
         });
@@ -164,17 +179,29 @@ export class NullGenerator {
 export class WorkerGenerator {
     constructor(config) {
         this.config = config;
-        this.new_mask = true;
-        this.last_mask = new Float32Array(this.config.mask.output_size.height * this.config.mask.output_size.width);
+        this.newMask = true;
+        this.lastMask = new Float32Array(this.config.mask.output_size.height * this.config.mask.output_size.width);
+        this.lastResult = {
+            data: this.lastMask,
+            facesAndLandmarks: { data: new Float32Array(0), dims: [] },
+            gesture: new Float32Array(0),
+            motion: 0,
+            timestamp: 0,
+            warm: false,
+        };
     }
     /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
-    getMask(_) {
+    getLadonOutput(_) {
         return __awaiter(this, void 0, void 0, function* () {
             const toReturn = {
-                data: this.last_mask,
-                warm: this.new_mask,
+                data: this.lastMask,
+                facesAndLandmarks: this.lastResult.facesAndLandmarks,
+                gesture: this.lastResult.gesture,
+                motion: this.lastResult.motion,
+                timestamp: this.lastResult.timestamp,
+                warm: this.newMask,
             };
-            this.new_mask = false;
+            this.newMask = false;
             return toReturn;
         });
     }
@@ -200,9 +227,17 @@ export class WorkerGenerator {
                 resolutionCb = resolve;
             });
             this.worker.onmessage = (event) => {
-                if (event.data.mask) {
-                    this.last_mask = event.data.mask;
-                    this.new_mask = true;
+                if (event.data.status === 'generated') {
+                    this.lastMask = event.data.mask;
+                    this.lastResult = {
+                        data: event.data.mask,
+                        facesAndLandmarks: event.data.facesAndLandmarks,
+                        gesture: event.data.gesture,
+                        motion: event.data.motion,
+                        timestamp: event.data.timestamp,
+                        warm: true,
+                    };
+                    this.newMask = true;
                 }
                 else {
                     const workerUrl = sharedResourceManager.getWorkerUrl();
@@ -218,7 +253,7 @@ export class WorkerGenerator {
     isLoaded() {
         return !!this.worker;
     }
-    postRender(input) {
+    postRender(input, timestamp) {
         return __awaiter(this, void 0, void 0, function* () {
             // claim ownership of the input tensor's buffer and forward to worker
             if (!this.worker) {
@@ -227,6 +262,7 @@ export class WorkerGenerator {
             this.worker.postMessage({
                 type: 'generate',
                 image: input,
+                timestamp,
             }, [input.buffer]);
         });
     }
@@ -234,4 +270,4 @@ export class WorkerGenerator {
         sharedResourceManager.terminateWorker();
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/lib/generator.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/lib/generator.ts"],"names":[],"mappings":"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"}