videonanalysis: add filtering options to smart motion sensor

koush · Mar 23, 2024 · 70c4d62 · 70c4d62
1 parent c20c960
commit 70c4d62
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 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.32",
+   "version": "0.1.33",
    "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/smart-motionsensor.ts b/plugins/objectdetector/src/smart-motionsensor.ts
@@ -43,6 +43,18 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R
             type: 'number',
             defaultValue: 0.7,
         },
+        requireDetectionThumbnail: {
+            title: 'Rquire Detections with Images',
+            description: 'When enabled, this sensor will ignore detections results that do not have images.',
+            type: 'boolean',
+            defaultValue: false,
+        },
+        requireScryptedNvrDetections: {
+            title: 'Require Scrypted Detections',
+            description: 'When enabled, this sensor will ignore onboard camera detections.',
+            type: 'boolean',
+            defaultValue: false,
+        },
     });
 
     listener: EventListenerRegister;
@@ -141,7 +153,13 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R
 
         this.listener = objectDetector.listen(ScryptedInterface.ObjectDetector, (source, details, data) => {
             const detected: ObjectsDetected = data;
+
+            if (this.storageSettings.values.requireDetectionThumbnail && !detected.detectionId)
+                return false;
+
             const match = detected.detections?.find(d => {
+                if (this.storageSettings.values.requireScryptedNvrDetections && !d.boundingBox)
+                    return false;
                 if (d.score && d.score < this.storageSettings.values.minScore)
                     return false;
                 if (!detections.includes(d.className))