@zappar/zappar-cv 3.0.1-alpha.5 → 3.0.1-alpha.8

package/lib/worker-server.js

@@ -12,9 +12,8 @@ import { getRuntimeObject } from "./gen/zappar-cwrap";
 import { zappar_server } from "./gen/zappar-server";
 import { MsgManager } from "./messages";
 import { mat4 } from "gl-matrix";
-import { frame_pixel_format_t } from "./gen/zappar-native";
+import { camera_profile_t, frame_pixel_format_t } from "./gen/zappar-native";
 import { handleImageBitmap } from "./worker-imagebitmap";
-import { profile } from "./profile";
 import { getWorkerMessageAPI } from "./worker-messages";
 import { getDataDownloadAPI } from "./data-download";
 export let messageManager = new MsgManager();
@@ -22,6 +21,7 @@ let workerMessageChannel;
 let latestCameraToScreenRotation = 0;
 let rawDataAccessEnabled = false;
 const rawCameraFrameBuffersByPipeline = new Map();
+const cameraProfileBySource = new Map();
 export function launchWorkerServer(wasmUrl, module, shouldRecordData) {
     return __awaiter(this, void 0, void 0, function* () {
         let mod = ZNM.default({
@@ -99,6 +99,11 @@ export function launchWorkerServer(wasmUrl, module, shouldRecordData) {
                             messageManager.postOutgoingMessage(ret, []);
                             break;
                         }
+                        case "cameraProfileC2S": {
+                            let msgt = msg;
+                            cameraProfileBySource.set(msgt.source, msgt.p);
+                            break;
+                        }
                         case "streamC2S": {
                             let msgt = msg;
                             consumeStream(mod, r, msgt.s, msgt.p, msgt.userFacing, server, msgt.source, workerMessageAPI, dataDownloadAPI).then(() => {
@@ -250,16 +255,22 @@ function consumeReader(mod, r, reader, p, userFacing, server, source, workerMess
                     uvTransform = new Float32Array([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
                     break;
             }
+            let downSample = false;
+            if (cameraProfileBySource.get(source) !== camera_profile_t.HIGH) {
+                dataWidth /= 2;
+                dataHeight /= 2;
+                downSample = true;
+            }
             let clone = frame.clone();
             if (userFacing)
                 mat4.fromScaling(cameraToDeviceTransform, [-1, 1, -1]);
             else
                 mat4.identity(cameraToDeviceTransform);
-            let focalLength = 300.0 * profile.dataWidth / 320.0;
+            let focalLength = 300.0 * dataWidth / 320.0;
             cameraModel[0] = focalLength;
             cameraModel[1] = focalLength;
-            cameraModel[2] = profile.dataWidth * 0.5;
-            cameraModel[3] = profile.dataHeight * 0.5;
+            cameraModel[2] = dataWidth * 0.5;
+            cameraModel[3] = dataHeight * 0.5;
             const ret = {
                 token: token,
                 d: clone,
@@ -267,8 +278,8 @@ function consumeReader(mod, r, reader, p, userFacing, server, source, workerMess
                 t: "videoFrameS2C",
                 userFacing,
                 uvTransform,
-                w: profile.dataWidth,
-                h: profile.dataHeight,
+                w: dataWidth,
+                h: dataHeight,
                 cameraToDevice: cameraToDeviceTransform,
                 cameraModel,
                 source
@@ -277,7 +288,7 @@ function consumeReader(mod, r, reader, p, userFacing, server, source, workerMess
             const pipeline = server._pipeline_by_instance.get(p);
             if (pipeline) {
                 try {
-                    r.pipeline_camera_frame_submit_raw_pointer(pipeline, streamDataBufferPointer, size, framePixelFormatFromFormat(frame.format), width, height, token, cameraToDeviceTransform, latestCameraToScreenRotation, cameraModel, userFacing, (_b = frame.timestamp) !== null && _b !== void 0 ? _b : -1);
+                    r.pipeline_camera_frame_submit_raw_pointer(pipeline, streamDataBufferPointer, size, framePixelFormatFromFormat(frame.format), width, height, token, cameraToDeviceTransform, latestCameraToScreenRotation, cameraModel, userFacing, (_b = frame.timestamp) !== null && _b !== void 0 ? _b : -1, downSample);
                     handleMessages(mod, workerMessageAPI);
                     if (dataDownloadAPI)
                         handleDataDownload(mod, dataDownloadAPI);

package/lib/workerinterface.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="dom-webcodecs" />
 import { CameraFrameData } from "./camera-frame-data";
-import { zappar_camera_source_t, zappar_pipeline_t } from "./gen/zappar-native";
+import { camera_profile_t, zappar_camera_source_t, zappar_pipeline_t } from "./gen/zappar-native";
 export interface CameraFrameC2S {
     t: "cameraFrameC2S";
     d: ArrayBuffer;
@@ -39,6 +39,12 @@ export interface StreamC2S {
     userFacing: boolean;
     source: zappar_camera_source_t;
 }
+export interface CameraProfileC2S {
+    t: "cameraProfileC2S";
+    p: zappar_pipeline_t;
+    source: zappar_camera_source_t;
+    profile: camera_profile_t;
+}
 export interface CameraToScreenRotationC2S {
     t: "cameraToScreenC2S";
     p: zappar_pipeline_t;
@@ -53,6 +59,7 @@ export interface ImageBitmapC2S {
     tokenId: number;
     cameraModel: Float32Array;
     cameraToDevice: Float32Array;
+    cp: camera_profile_t;
 }
 export interface ImageBitmapS2C {
     t: "imageBitmapS2C";