videoanalysis: correctly pass motion zones to object detector

koush · May 28, 2023 · 6f5244e · 6f5244e
1 parent f1eb2f9
commit 6f5244e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/plugins/objectdetector/package-lock.json b/plugins/objectdetector/package-lock.json
diff --git a/plugins/objectdetector/package.json b/plugins/objectdetector/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/objectdetector",
-   "version": "0.0.140",
+   "version": "0.0.141",
    "description": "Scrypted Video Analysis Plugin. Installed alongside a detection service like OpenCV or TensorFlow.",
    "author": "Scrypted",
    "license": "Apache-2.0",

diff --git a/plugins/objectdetector/src/main.ts b/plugins/objectdetector/src/main.ts
@@ -414,15 +414,15 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
       for (const mixin of detectorMixin.currentMixins.values()) {
         if (mixin.id !== this.id)
           continue;
-        for (const [key, zi] of Object.entries(mixin.zoneInfos)) {
-          const zone = mixin.zones[key];
+        for (const [key, zone] of Object.entries(mixin.zones)) {
+          const zi = mixin.zoneInfos[key];
           if (!zone?.length || zone?.length < 3)
             continue;
           const odz: ObjectDetectionZone = {
-            classes: mixin.hasMotionType ? ['motion'] : zi.classes,
-            exclusion: zi.exclusion,
+            classes: mixin.hasMotionType ? ['motion'] : zi?.classes,
+            exclusion: zi?.exclusion,
             path: zone,
-            type: zi.type,
+            type: zi?.type,
           }
           zones.push(odz);
         }