diff --git a/common/src/autoenable-mixin-provider.ts b/common/src/autoenable-mixin-provider.ts index 438b7741a..91108ab79 100644 --- a/common/src/autoenable-mixin-provider.ts +++ b/common/src/autoenable-mixin-provider.ts @@ -41,11 +41,15 @@ export abstract class AutoenableMixinProvider extends ScryptedDeviceBase { return true; } + checkHasEnabledMixin(device: ScryptedDevice) { + return this.hasEnabledMixin[device.id] === this.autoIncludeToken; + } + async maybeEnableMixin(device: ScryptedDevice) { if (!device || device.mixins?.includes(this.id)) return; - if (this.hasEnabledMixin[device.id] === this.autoIncludeToken) + if (this.checkHasEnabledMixin(device)) return; const match = await this.canMixin(device.type, device.interfaces); diff --git a/plugins/diagnostics/src/main.ts b/plugins/diagnostics/src/main.ts index 3bc5ddd46..73fa73e5f 100644 --- a/plugins/diagnostics/src/main.ts +++ b/plugins/diagnostics/src/main.ts @@ -211,7 +211,7 @@ class DiagnosticsPlugin extends ScryptedDeviceBase implements Settings { const start = Date.now(); await validateMedia(stepName + ' (IDR)', getVideoStream(destination), false, async () => { const end = Date.now(); - if (end - start > 4500) + if (end - start > 5000) throw new Error(`High IDR Interval. This may cause issues with HomeKit Secure Video. Adjust codec configuration if possible.`); }); }; diff --git a/plugins/objectdetector/package-lock.json b/plugins/objectdetector/package-lock.json index b39523184..629e473d7 100644 --- a/plugins/objectdetector/package-lock.json +++ b/plugins/objectdetector/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/objectdetector", - "version": "0.1.44", + "version": "0.1.45", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/objectdetector", - "version": "0.1.44", + "version": "0.1.45", "license": "Apache-2.0", "dependencies": { "@scrypted/common": "file:../../common", diff --git a/plugins/objectdetector/package.json b/plugins/objectdetector/package.json index aff9c8f91..861f4fd23 100644 --- a/plugins/objectdetector/package.json +++ b/plugins/objectdetector/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/objectdetector", - "version": "0.1.44", + "version": "0.1.45", "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 index 19740f32b..48b71f7d3 100644 --- a/plugins/objectdetector/src/main.ts +++ b/plugins/objectdetector/src/main.ts @@ -1059,6 +1059,10 @@ export class ObjectDetectionPlugin extends AutoenableMixinProvider implements Se }, 10000) } + checkHasEnabledMixin(device: ScryptedDevice): boolean { + return false; + } + pruneOldStatistics() { const now = Date.now(); for (const [k, v] of this.objectDetectionStatistics.entries()) {