beenull/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Manav Rathi 2024-05-18 17:42:27 +05:30
parent aa76448747
commit c8623bab12
No known key found for this signature in database
1 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
web/apps/photos/src/services/face/f-index.ts
View file

@ -6,7 +6,6 @@ import { euclidean } from "hdbscan";
import { Matrix } from "ml-matrix";
import { Box, Dimensions, Point, enlargeBox } from "services/face/geom";
import {
DetectedFace,
Face,
FaceAlignment,
FaceCrop,
@ -95,8 +94,9 @@ const fetchOrCreateImageBitmap = async (
const indexFaces_ = async (enteFile: EnteFile, imageBitmap: ImageBitmap) => {
const fileContext: MLSyncFileContext = { enteFile };
const fileID = enteFile.id;
const newMlFile = (fileContext.newMlFile = {
fileId: enteFile.id,
fileId: fileID,
mlVersion: defaultMLVersion,
errorCount: 0,
} as MlFileData);
@ -106,20 +106,12 @@ const indexFaces_ = async (enteFile: EnteFile, imageBitmap: ImageBitmap) => {
fileContext.newMlFile.imageDimensions = { width, height };
const faceDetections = await detectFaces(imageBitmap);
const detectedFaces = faceDetections?.map((detection) => {
return {
fileId: fileContext.enteFile.id,
const detectedFaces = faceDetections.map((detection) => ({
id: makeFaceID(fileID, detection, newMlFile.imageDimensions),
fileId: fileID,
detection,
} as DetectedFace;
});
newMlFile.faces = detectedFaces?.map((detectedFace) => ({
...detectedFace,
id: makeFaceID(detectedFace, newMlFile.imageDimensions),
}));
// TODO-ML(MR): reenable faces filtering based on width
// ?.filter((f) =>
// f.box.width > syncContext.config.faceDetection.minFaceSize
// );
newMlFile.faces = detectedFaces;
if (newMlFile.faces && newMlFile.faces.length > 0) {
await syncFileFaceCrops(fileContext);
@ -142,7 +134,7 @@ const indexFaces_ = async (enteFile: EnteFile, imageBitmap: ImageBitmap) => {
*/
const detectFaces = async (
imageBitmap: ImageBitmap,
): Promise<Array<FaceDetection>> => {
): Promise<FaceDetection[]> => {
const rect = ({ width, height }: { width: number; height: number }) =>
new Box({ x: 0, y: 0, width, height });
@ -156,6 +148,11 @@ const detectFaces = async (
rect(imageBitmap),
);
// TODO-ML: reenable faces filtering based on width ?? else remove me
// ?.filter((f) =>
// f.box.width > syncContext.config.faceDetection.minFaceSize
// );
const maxFaceDistancePercent = Math.sqrt(2) / 100;
const maxFaceDistance = imageBitmap.width * maxFaceDistancePercent;
return removeDuplicateDetections(faceDetections, maxFaceDistance);
@ -325,6 +322,23 @@ const faceDetectionCenter = (detection: FaceDetection) => {
return new Point(center.x / 4, center.y / 4);
};
const makeFaceID = (
fileID: number,
detection: FaceDetection,
imageDims: Dimensions,
) => {
const part = (v: number) => clamp(v, 0.0, 0.999999).toFixed(5).substring(2);
const xMin = part(detection.box.x / imageDims.width);
const yMin = part(detection.box.y / imageDims.height);
const xMax = part(
(detection.box.x + detection.box.width) / imageDims.width,
);
const yMax = part(
(detection.box.y + detection.box.height) / imageDims.height,
);
return [`${fileID}`, xMin, yMin, xMax, yMax].join("_");
};
const syncFileFaceCrops = async (fileContext: MLSyncFileContext) => {
const { newMlFile } = fileContext;
const imageBitmap = fileContext.imageBitmap;
@ -466,21 +480,6 @@ async function extractFaceImagesToFloat32(
return faceData;
}
const makeFaceID = (detectedFace: DetectedFace, imageDims: Dimensions) => {
const part = (v: number) => clamp(v, 0.0, 0.999999).toFixed(5).substring(2);
const xMin = part(detectedFace.detection.box.x / imageDims.width);
const yMin = part(detectedFace.detection.box.y / imageDims.height);
const xMax = part(
(detectedFace.detection.box.x + detectedFace.detection.box.width) /
imageDims.width,
);
const yMax = part(
(detectedFace.detection.box.y + detectedFace.detection.box.height) /
imageDims.height,
);
return [detectedFace.fileId, xMin, yMin, xMax, yMax].join("_");
};
/**
* Laplacian blur detection.
*/