From 772215eddc5a0f87d91191faf69fc020b4c7b9de Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Sat, 18 May 2024 10:59:11 +0530 Subject: [PATCH] Rearrange --- web/apps/photos/src/services/face/f-index.ts | 2 ++ web/apps/photos/src/services/face/image.ts | 18 ++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/apps/photos/src/services/face/f-index.ts b/web/apps/photos/src/services/face/f-index.ts index 4f55863718..64eaa8d1a8 100644 --- a/web/apps/photos/src/services/face/f-index.ts +++ b/web/apps/photos/src/services/face/f-index.ts @@ -529,6 +529,8 @@ const detectBlur = (alignedFaces: Float32Array, faces: Face[]): number[] => { const faceImage = createGrayscaleIntMatrixFromNormalized2List( alignedFaces, i, + mobileFaceNetFaceSize, + mobileFaceNetFaceSize, ); const laplacian = applyLaplacian(faceImage, direction); blurValues.push(matrixVariance(laplacian)); diff --git a/web/apps/photos/src/services/face/image.ts b/web/apps/photos/src/services/face/image.ts index f1f3dd98ee..350b375894 100644 --- a/web/apps/photos/src/services/face/image.ts +++ b/web/apps/photos/src/services/face/image.ts @@ -52,14 +52,6 @@ export async function getLocalFileImageBitmap( return createImageBitmap(fileBlob); } -export function normalizePixelBetweenMinus1And1(pixelValue: number) { - return pixelValue / 127.5 - 1.0; -} - -export function unnormalizePixelFromBetweenMinus1And1(pixelValue: number) { - return clamp(Math.round((pixelValue + 1.0) * 127.5), 0, 255); -} - /** * Returns the pixel value (RGB) at the given coordinates ({@link fx}, * {@link fy}) using bicubic interpolation. @@ -323,11 +315,17 @@ export function warpAffineFloat32List( } } +const normalizePixelBetweenMinus1And1 = (pixelValue: number) => + pixelValue / 127.5 - 1.0; + +const unnormalizePixelFromBetweenMinus1And1 = (pixelValue: number) => + clamp(Math.round((pixelValue + 1.0) * 127.5), 0, 255); + export function createGrayscaleIntMatrixFromNormalized2List( imageList: Float32Array, faceNumber: number, - width: number = 112, - height: number = 112, + width: number, + height: number, ): number[][] { const startIndex = faceNumber * width * height * 3; return Array.from({ length: height }, (_, y) =>