michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-02-03 14:13:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

snapshot: publish with aspect ratio override fixes

Browse Source
This commit is contained in:
Koushik Dutta
2025-11-17 15:16:57 -08:00
parent e691c71224
commit c6771ce8ae
3 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,12 @@
{
"name": "@scrypted/snapshot",
"version": "0.2.62",
"version": "0.2.64",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/snapshot",
"version": "0.2.62",
"version": "0.2.64",
"dependencies": {
"@types/node": "^22.10.2",
"sharp": "^0.33.5",

2
plugins/snapshot/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/snapshot",
"version": "0.2.62",
"version": "0.2.64",
"description": "Snapshot Plugin for Scrypted",
"scripts": {
"scrypted-setup-project": "scrypted-setup-project",

51
plugins/snapshot/src/main.ts
View File

@@ -32,6 +32,25 @@ class PrebufferUnavailableError extends Error {
}
function calculateConstrainedDimensions(originalWidth: number, originalHeight: number, targetAspectRatio: number) {
const imageAspectRatio = originalWidth / originalHeight;
if (imageAspectRatio > targetAspectRatio) {
// Image is wider than target aspect ratio, constrain by height
return {
width: Math.round(originalHeight * targetAspectRatio),
height: originalHeight
};
} else {
// Image is taller than target aspect ratio, constrain by width
return {
width: originalWidth,
height: Math.round(originalWidth / targetAspectRatio)
};
}
}
class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera, Resolution {
storageSettings = new StorageSettings(this, {
defaultSnapshotChannel: {
@@ -409,8 +428,16 @@ class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera, R
if (loadSharp()) {
const vips = await loadVipsImage(rawPicture.picture, this.id);
if (this.resolution?.[0] !== vips.width || this.resolution?.[1] !== vips.height)
this.resolution = [vips.width, vips.height];
let resolutionWidth = vips.width;
let resolutionHeight = vips.height;
if (aspectRatio) {
const constrained = calculateConstrainedDimensions(vips.width, vips.height, aspectRatio);
resolutionWidth = constrained.width;
resolutionHeight = constrained.height;
}
if (this.resolution?.[0] !== resolutionWidth || this.resolution?.[1] !== resolutionHeight)
this.resolution = [resolutionWidth, resolutionHeight];
let resizeOptions = options?.picture;
if (aspectRatio) {
@@ -418,21 +445,11 @@ class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera, R
const { width, height } = resizeOptions;
if (!width && !height) {
const imageAspectRatio = vips.width / vips.height;
if (imageAspectRatio > aspectRatio) {
resizeOptions = {
...resizeOptions,
height: vips.height,
width: Math.round(vips.height * aspectRatio)
};
} else {
resizeOptions = {
...resizeOptions,
width: vips.width,
height: Math.round(vips.width / aspectRatio)
};
}
resizeOptions = {
...resizeOptions,
width: resolutionWidth,
height: resolutionHeight,
};
}
else if (!width) {
resizeOptions = {