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

coral: wip

Browse Source
This commit is contained in:
Koushik Dutta
2021-12-05 00:48:45 -08:00
parent c018c5c19b
commit 1861bdd283
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/coral/src/main.py
View File

@@ -181,6 +181,7 @@ class CoralPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection):
score_threshold = -float('inf')
duration = None
detection_id = None
detection_session = None
if session:
detection_id = session.get('detectionId', -float('inf'))

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

@@ -18,7 +18,8 @@ const defaultDetectionTimeout = 10;
class ObjectDetectionMixin extends SettingsMixinDeviceBase<ObjectDetector> implements ObjectDetector, Settings {
released = false;
registerMotion: EventListenerRegister;
motionListener: EventListenerRegister;
detectionListener: EventListenerRegister;
detections = new Map<string, DetectionInput>();
realDevice: ScryptedDevice & Camera & VideoCamera & ObjectDetector & MotionSensor;
minConfidence = parseFloat(this.storage.getItem('minConfidence')) || defaultMinConfidence;
@@ -30,7 +31,6 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<ObjectDetector> imple
currentPeople: DenoisedDetectionEntry<FaceRecognitionResult>[] = [];
objectDetection: ObjectDetection & ScryptedDevice;
detectionId = randomBytes(8).toString('hex');
detectionListener: EventListenerRegister;
constructor(mixinDevice: VideoCamera & Settings, mixinDeviceInterfaces: ScryptedInterface[], mixinDeviceState: { [key: string]: any }, public objectDetectionPlugin: ObjectDetectionPlugin) {
super(mixinDevice, mixinDeviceState, {
@@ -84,18 +84,18 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<ObjectDetector> imple
return;
}
this.objectDetection.listen({
this.detectionListener = this.objectDetection.listen({
event: ScryptedInterface.ObjectDetection,
watch: false,
}, (eventSource, eventDetails, eventData: ObjectsDetected) => {
if (eventData?.detectionId !== this.detectionId)
return;
this.objectsDetected(eventData)
})
});
}
async register() {
this.registerMotion = this.realDevice.listen(ScryptedInterface.MotionSensor, async () => {
this.motionListener = this.realDevice.listen(ScryptedInterface.MotionSensor, async () => {
if (!this.realDevice.motionDetected)
return;
this.resetDetectionTimeout();
@@ -316,9 +316,11 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<ObjectDetector> imple
}
release() {
super.release();
this.released = true;
this.clearDetectionTimeout();
this.registerMotion?.removeListener();
this.motionListener?.removeListener();
this.detectionListener?.removeListener();
this.objectDetection?.detectObjects(undefined, {
detectionId: this.detectionId,
});