michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-09-17 17:20:39 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

objectdetector: more denoise fixes

Browse Source
This commit is contained in:
Koushik Dutta
2021-12-02 21:54:10 -08:00
parent bd8c61f195
commit 326baa8d43
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/objectdetector/src/main.ts
View File

@@ -65,7 +65,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<ObjectDetector> imple
detectionId: this.detectionId,
minScore: this.minConfidence,
});
this.objectsDetected(detections, true);
this.objectsDetected(detections);
}
bindObjectDetection() {
@@ -107,19 +107,18 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<ObjectDetector> imple
});
}
reportObjectDetections(detectionInput?: DetectionInput) {
const detectionId = Math.random().toString();
reportObjectDetections(detections: ObjectDetectionResult[], detectionInput?: DetectionInput) {
const detection: ObjectsDetected = {
timestamp: Date.now(),
detectionId: detectionInput ? detectionId : undefined,
detectionId: detectionInput ? this.detectionId : undefined,
inputDimensions: detectionInput
? [detectionInput?.input.shape[1], detectionInput?.input.shape[0]]
: undefined,
detections: this.currentDetections.map(d => d.detection),
detections,
}
if (detectionInput)
this.setDetection(detectionId, detectionInput);
this.setDetection(this.detectionId, detectionInput);
this.onDeviceEvent(ScryptedInterface.ObjectDetector, detection);
}
@@ -136,7 +135,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<ObjectDetector> imple
}
}
async objectsDetected(detectionResult: ObjectsDetected, idle?: boolean) {
async objectsDetected(detectionResult: ObjectsDetected) {
this.resetDetectionTimeout();
if (!detectionResult?.detections) {
// detection session ended.
@@ -154,8 +153,9 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<ObjectDetector> imple
timeout: this.detectionTimeout * 1000,
added: d => found.push(d),
removed: d => {
this.console.log('detection no longer present:', d.name)
this.reportObjectDetections()
this.console.log('expired detection:', `${d.detection.className} (${d.detection.score}, ${d.detection.id})`);
if (detectionResult.running)
this.extendedObjectDetect();
}
});
if (found.length) {
@@ -165,7 +165,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<ObjectDetector> imple
this.extendedObjectDetect();
}
this.reportObjectDetections(undefined);
this.reportObjectDetections(detectionResult.detections, undefined);
}
reportPeopleDetections(faces?: ObjectDetectionResult[], detectionInput?: DetectionInput) {