videoanalysis: fix broken concave polygon math, optimize for intersec…

…t boolean rather than intersect polygon
koush · Jan 8, 2025 · f8a8ed4 · f8a8ed4
1 parent 892b978
commit f8a8ed4
Show file tree

Hide file tree

Showing 5 changed files with 151 additions and 196 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.1.62",
+   "version": "0.1.63",
    "description": "Scrypted Video Analysis Plugin. Installed alongside a detection service like OpenCV or TensorFlow.",
    "author": "Scrypted",
    "license": "Apache-2.0",
@@ -46,12 +46,9 @@
    },
    "dependencies": {
       "@scrypted/common": "file:../../common",
-      "@scrypted/sdk": "file:../../sdk",
-      "polygon-clipping": "^0.15.7",
-      "semver": "^7.5.4"
+      "@scrypted/sdk": "file:../../sdk"
    },
    "devDependencies": {
-      "@types/node": "^20.11.0",
-      "@types/semver": "^7.5.6"
+      "@types/node": "^20.11.0"
    }
 }
diff --git a/plugins/objectdetector/src/main.ts b/plugins/objectdetector/src/main.ts
@@ -6,7 +6,7 @@ import crypto from 'crypto';
 import { AutoenableMixinProvider } from "../../../common/src/autoenable-mixin-provider";
 import { SettingsMixinDeviceBase } from "../../../common/src/settings-mixin";
 import { FFmpegVideoFrameGenerator } from './ffmpeg-videoframes';
-import { fixLegacyClipPath, insidePolygon, normalizeBoxToClipPath, polygonOverlap } from './polygon';
+import { fixLegacyClipPath, normalizeBox, polygonContainsBoundingBox, polygonIntersectsBoundingBox } from './polygon';
 import { SMART_MOTIONSENSOR_PREFIX, SmartMotionSensor } from './smart-motionsensor';
 import { SMART_OCCUPANCYSENSOR_PREFIX, SmartOccupancySensor } from './smart-occupancy-sensor';
 import { getAllDevices, safeParseJson } from './util';
@@ -545,7 +545,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
       if (!o.boundingBox)
         continue;
 
-      const box = normalizeBoxToClipPath(o.boundingBox, detection.inputDimensions);
+      const box = normalizeBox(o.boundingBox, detection.inputDimensions);
 
       let included: boolean;
       // need a way to explicitly include package zone.
@@ -572,13 +572,10 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
 
         let match = false;
         if (zoneInfo?.type === 'Contain') {
-          match = insidePolygon(box[0] as Point, zoneValue) &&
-            insidePolygon(box[1], zoneValue) &&
-            insidePolygon(box[2], zoneValue) &&
-            insidePolygon(box[3], zoneValue);
+          match = polygonContainsBoundingBox(zoneValue, box);
         }
         else {
-          match = polygonOverlap(box, zoneValue);
+          match = polygonIntersectsBoundingBox(zoneValue, box);
         }
 
         const classes = zoneInfo?.classes?.length ? zoneInfo?.classes : this.model?.classes || [];
@@ -604,7 +601,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
       // prevents errant motion from the on screen time changing every second.
       if (this.hasMotionType && included === undefined) {
         const defaultInclusionZone: ClipPath = [[0, .1], [1, .1], [1, .9], [0, .9]];
-        included = polygonOverlap(box, defaultInclusionZone);
+        included = polygonIntersectsBoundingBox(defaultInclusionZone, box);
       }
 
       // if there are inclusion zones and this object