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

videoanalysis: logging

Browse Source
This commit is contained in:
Koushik Dutta
2023-05-18 20:10:36 -07:00
parent e3d4800e4f
commit 2abea2d25b
5 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/objectdetector/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/objectdetector",
"version": "0.0.138",
"version": "0.0.140",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/objectdetector",
"version": "0.0.138",
"version": "0.0.140",
"license": "Apache-2.0",
"dependencies": {
"@scrypted/common": "file:../../common",

2
plugins/objectdetector/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/objectdetector",
"version": "0.0.138",
"version": "0.0.140",
"description": "Scrypted Video Analysis Plugin. Installed alongside a detection service like OpenCV or TensorFlow.",
"author": "Scrypted",
"license": "Apache-2.0",

5
plugins/objectdetector/src/ffmpeg-videoframes-no-sharp.ts
View File

@@ -19,6 +19,7 @@ async function createRawImageMediaObject(image: RawImage): Promise<Image & Media
height: image.height,
toBuffer: (options: ImageOptions) => image.toBuffer(options),
toImage: (options: ImageOptions) => image.toImage(options),
close: () => image.close(),
});
return ret;
@@ -28,6 +29,10 @@ class RawImage implements Image, RawFrame {
constructor(public data: Buffer, public width: number, public height: number, public format: ImageFormat) {
}
async close(): Promise<void> {
this.data = undefined;
}
checkOptions(options: ImageOptions) {
if (options?.resize || options?.crop)
throw new Error('resize and crop are not supported');

6
plugins/objectdetector/src/ffmpeg-videoframes.ts
View File

@@ -37,6 +37,7 @@ async function createVipsMediaObject(image: VipsImage): Promise<Image & MediaObj
const newImage = await image.toVipsImage(options);
return createVipsMediaObject(newImage);
},
close: () => image.close(),
});
return ret;
@@ -52,6 +53,11 @@ class VipsImage implements Image {
constructor(public image: sharp.Sharp, public width: number, public height: number, public channels: number) {
}
async close(): Promise<void> {
this.image?.destroy();
this.image = undefined;
}
toImageInternal(options: ImageOptions) {
const transformed = this.image.clone();
if (options?.crop) {

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

@@ -270,10 +270,13 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
.catch(e => {
this.console.error('Video Analysis ended with error', e);
}).finally(() => {
if (!this.hasMotionType)
if (!this.hasMotionType) {
this.plugin.objectDetectionEnded(this.console, options.snapshotPipeline);
else
this.console.log('Video Analysis object detection ended.');
}
else {
this.console.log('Video Analysis motion detection ended.');
}
signal.resolve();
});
}