From 16ba10da217574359589433b61e962eb02cafd4f Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sun, 8 Sep 2024 16:43:37 -0700 Subject: [PATCH] videoanalysis: deprecate electron core --- plugins/objectdetector/package-lock.json | 4 ++-- plugins/objectdetector/package.json | 2 +- plugins/objectdetector/src/main.ts | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/objectdetector/package-lock.json b/plugins/objectdetector/package-lock.json index e8e177a990..b395231847 100644 --- a/plugins/objectdetector/package-lock.json +++ b/plugins/objectdetector/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/objectdetector", - "version": "0.1.43", + "version": "0.1.44", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/objectdetector", - "version": "0.1.43", + "version": "0.1.44", "license": "Apache-2.0", "dependencies": { "@scrypted/common": "file:../../common", diff --git a/plugins/objectdetector/package.json b/plugins/objectdetector/package.json index 216f9b0a07..aff9c8f911 100644 --- a/plugins/objectdetector/package.json +++ b/plugins/objectdetector/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/objectdetector", - "version": "0.1.43", + "version": "0.1.44", "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 717c8c9f95..19740f32bf 100644 --- a/plugins/objectdetector/src/main.ts +++ b/plugins/objectdetector/src/main.ts @@ -661,12 +661,11 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase d.interfaces.includes(ScryptedInterface.VideoFrameGenerator)); - const webcodec = process.env.SCRYPTED_INSTALL_ENVIRONMENT === 'electron' ? sdk.systemManager.getDeviceById('@scrypted/electron-core', 'webcodec') : undefined; const webassembly = sdk.systemManager.getDeviceById('@scrypted/nvr', 'decoder') || undefined; const gstreamer = sdk.systemManager.getDeviceById('@scrypted/python-codecs', 'gstreamer') || undefined; const libav = sdk.systemManager.getDeviceById('@scrypted/python-codecs', 'libav') || undefined; const ffmpeg = sdk.systemManager.getDeviceById('@scrypted/objectdetector', 'ffmpeg') || undefined; - const use = pipelines.find(p => p.name === frameGenerator) || webcodec || webassembly || gstreamer || libav || ffmpeg; + const use = pipelines.find(p => p.name === frameGenerator) || webassembly || gstreamer || libav || ffmpeg; return use.id; }