mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-11-19 20:13:01 +03:00
Support HEIC images for Face Recognition (#25024)
CI / AMD64 Build (push) Waiting to run
CI / AMD64 Smoke Test (push) Blocked by required conditions
CI / ARM Build (push) Waiting to run
CI / Jetson Jetpack 6 (push) Waiting to run
CI / AMD64 Extra Build (push) Blocked by required conditions
CI / ARM Extra Build (push) Blocked by required conditions
CI / Synaptics Build (push) Blocked by required conditions
CI / Assemble and push default build (push) Blocked by required conditions
CI / AMD64 Build (push) Waiting to run
CI / AMD64 Smoke Test (push) Blocked by required conditions
CI / ARM Build (push) Waiting to run
CI / Jetson Jetpack 6 (push) Waiting to run
CI / AMD64 Extra Build (push) Blocked by required conditions
CI / ARM Extra Build (push) Blocked by required conditions
CI / Synaptics Build (push) Blocked by required conditions
CI / Assemble and push default build (push) Blocked by required conditions
This commit is contained in:
Generated
+7
@@ -46,6 +46,7 @@
|
|||||||
"date-fns": "^4.4.0",
|
"date-fns": "^4.4.0",
|
||||||
"date-fns-tz": "^3.2.0",
|
"date-fns-tz": "^3.2.0",
|
||||||
"framer-motion": "^14.12.0",
|
"framer-motion": "^14.12.0",
|
||||||
|
"heic-to": "^1.6.7",
|
||||||
"hls.js": "^1.7.4",
|
"hls.js": "^1.7.4",
|
||||||
"i18next": "^27.1.1",
|
"i18next": "^27.1.1",
|
||||||
"i18next-http-backend": "^4.0.10",
|
"i18next-http-backend": "^4.0.10",
|
||||||
@@ -6018,6 +6019,12 @@
|
|||||||
"url": "https://opencollective.com/unified"
|
"url": "https://opencollective.com/unified"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/heic-to": {
|
||||||
|
"version": "1.6.7",
|
||||||
|
"resolved": "https://registry.npmjs.org/heic-to/-/heic-to-1.6.7.tgz",
|
||||||
|
"integrity": "sha512-GCPYNl86u6eZ7mr2aa+uQB+PrQOVKSBYfH8esovr8kh2c6EYQSDYIJ6uhXSmM2hPC8PdBVJ/Trn0jnfM9H9gvg==",
|
||||||
|
"license": "LGPL-3.0"
|
||||||
|
},
|
||||||
"node_modules/hermes-estree": {
|
"node_modules/hermes-estree": {
|
||||||
"version": "0.25.1",
|
"version": "0.25.1",
|
||||||
"resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
|
"resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
|
||||||
|
|||||||
@@ -58,6 +58,7 @@
|
|||||||
"date-fns": "^4.4.0",
|
"date-fns": "^4.4.0",
|
||||||
"date-fns-tz": "^3.2.0",
|
"date-fns-tz": "^3.2.0",
|
||||||
"framer-motion": "^14.12.0",
|
"framer-motion": "^14.12.0",
|
||||||
|
"heic-to": "^1.6.7",
|
||||||
"hls.js": "^1.7.4",
|
"hls.js": "^1.7.4",
|
||||||
"i18next": "^27.1.1",
|
"i18next": "^27.1.1",
|
||||||
"i18next-http-backend": "^4.0.10",
|
"i18next-http-backend": "^4.0.10",
|
||||||
|
|||||||
@@ -61,8 +61,10 @@
|
|||||||
},
|
},
|
||||||
"imageEntry": {
|
"imageEntry": {
|
||||||
"validation": {
|
"validation": {
|
||||||
"selectImage": "Please select an image file."
|
"selectImage": "Please select an image file.",
|
||||||
|
"heicConversionFailed": "Unable to convert this HEIC image. Try exporting it as a JPEG instead."
|
||||||
},
|
},
|
||||||
|
"converting": "Converting image…",
|
||||||
"dropActive": "Drop the image here…",
|
"dropActive": "Drop the image here…",
|
||||||
"dropInstructions": "Drag and drop or paste an image here, or click to select",
|
"dropInstructions": "Drag and drop or paste an image here, or click to select",
|
||||||
"maxSize": "Max size: {{size}}MB"
|
"maxSize": "Max size: {{size}}MB"
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import ActivityIndicator from "@/components/indicators/activity-indicator";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import {
|
import {
|
||||||
Form,
|
Form,
|
||||||
@@ -7,6 +8,11 @@ import {
|
|||||||
FormMessage,
|
FormMessage,
|
||||||
} from "@/components/ui/form";
|
} from "@/components/ui/form";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
import {
|
||||||
|
convertHeicToJpeg,
|
||||||
|
HEIC_EXTENSIONS,
|
||||||
|
isHeicFile,
|
||||||
|
} from "@/utils/heicUtil";
|
||||||
import { zodResolver } from "@hookform/resolvers/zod";
|
import { zodResolver } from "@hookform/resolvers/zod";
|
||||||
import { useCallback, useEffect, useRef, useState } from "react";
|
import { useCallback, useEffect, useRef, useState } from "react";
|
||||||
import { useDropzone } from "react-dropzone";
|
import { useDropzone } from "react-dropzone";
|
||||||
@@ -26,11 +32,25 @@ export default function ImageEntry({
|
|||||||
onSave,
|
onSave,
|
||||||
children,
|
children,
|
||||||
maxSize = 20 * 1024 * 1024, // 20MB default
|
maxSize = 20 * 1024 * 1024, // 20MB default
|
||||||
accept = { "image/*": [".jpeg", ".jpg", ".png", ".gif", ".webp"] },
|
accept = {
|
||||||
|
"image/*": [".jpeg", ".jpg", ".png", ".gif", ".webp", ...HEIC_EXTENSIONS],
|
||||||
|
},
|
||||||
}: ImageEntryProps) {
|
}: ImageEntryProps) {
|
||||||
const { t } = useTranslation(["views/faceLibrary"]);
|
const { t } = useTranslation(["views/faceLibrary"]);
|
||||||
const [preview, setPreview] = useState<string | null>(null);
|
const [preview, setPreview] = useState<string | null>(null);
|
||||||
|
const [converting, setConverting] = useState(false);
|
||||||
const dropzoneRef = useRef<HTMLDivElement>(null);
|
const dropzoneRef = useRef<HTMLDivElement>(null);
|
||||||
|
// Bumped on every selection and clear, so a HEIC conversion that finishes
|
||||||
|
// after the selection changed is discarded instead of applied
|
||||||
|
const selectionId = useRef(0);
|
||||||
|
|
||||||
|
// Discard conversions that finish after the component unmounts
|
||||||
|
useEffect(() => {
|
||||||
|
const id = selectionId;
|
||||||
|
return () => {
|
||||||
|
id.current += 1;
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
// Auto focus the dropzone
|
// Auto focus the dropzone
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -60,18 +80,48 @@ export default function ImageEntry({
|
|||||||
resolver: zodResolver(formSchema),
|
resolver: zodResolver(formSchema),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const selectFile = useCallback(
|
||||||
|
async (file: File) => {
|
||||||
|
const id = ++selectionId.current;
|
||||||
|
let selected = file;
|
||||||
|
|
||||||
|
if (isHeicFile(file)) {
|
||||||
|
setConverting(true);
|
||||||
|
const converted = await convertHeicToJpeg(file).catch(() => null);
|
||||||
|
|
||||||
|
// the selection was cleared or replaced while converting
|
||||||
|
if (id !== selectionId.current) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setConverting(false);
|
||||||
|
|
||||||
|
if (!converted) {
|
||||||
|
form.setError("file", {
|
||||||
|
message: t("imageEntry.validation.heicConversionFailed"),
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
selected = converted;
|
||||||
|
}
|
||||||
|
|
||||||
|
form.setValue("file", selected, { shouldValidate: true });
|
||||||
|
|
||||||
|
// Create preview
|
||||||
|
const objectUrl = URL.createObjectURL(selected);
|
||||||
|
setPreview(objectUrl);
|
||||||
|
},
|
||||||
|
[form, t],
|
||||||
|
);
|
||||||
|
|
||||||
const onDrop = useCallback(
|
const onDrop = useCallback(
|
||||||
(acceptedFiles: File[]) => {
|
(acceptedFiles: File[]) => {
|
||||||
if (acceptedFiles.length > 0) {
|
if (acceptedFiles.length > 0) {
|
||||||
const file = acceptedFiles[0];
|
selectFile(acceptedFiles[0]);
|
||||||
form.setValue("file", file, { shouldValidate: true });
|
|
||||||
|
|
||||||
// Create preview
|
|
||||||
const objectUrl = URL.createObjectURL(file);
|
|
||||||
setPreview(objectUrl);
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[form],
|
[selectFile],
|
||||||
);
|
);
|
||||||
|
|
||||||
const { getRootProps, getInputProps, isDragActive, isDragReject } =
|
const { getRootProps, getInputProps, isDragActive, isDragReject } =
|
||||||
@@ -80,11 +130,17 @@ export default function ImageEntry({
|
|||||||
maxSize,
|
maxSize,
|
||||||
accept,
|
accept,
|
||||||
multiple: false,
|
multiple: false,
|
||||||
|
disabled: converting,
|
||||||
});
|
});
|
||||||
|
|
||||||
const handlePaste = useCallback(
|
const handlePaste = useCallback(
|
||||||
(event: React.ClipboardEvent<HTMLDivElement>) => {
|
(event: React.ClipboardEvent<HTMLDivElement>) => {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
|
if (converting) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const clipboardItems = Array.from(event.clipboardData.items);
|
const clipboardItems = Array.from(event.clipboardData.items);
|
||||||
for (const item of clipboardItems) {
|
for (const item of clipboardItems) {
|
||||||
if (item.type.startsWith("image/")) {
|
if (item.type.startsWith("image/")) {
|
||||||
@@ -95,27 +151,30 @@ export default function ImageEntry({
|
|||||||
if (accept["image/*"].includes(extension)) {
|
if (accept["image/*"].includes(extension)) {
|
||||||
const fileName = blob.name || `pasted-image.${mimeType}`;
|
const fileName = blob.name || `pasted-image.${mimeType}`;
|
||||||
const file = new File([blob], fileName, { type: blob.type });
|
const file = new File([blob], fileName, { type: blob.type });
|
||||||
form.setValue("file", file, { shouldValidate: true });
|
selectFile(file);
|
||||||
const objectUrl = URL.createObjectURL(file);
|
|
||||||
setPreview(objectUrl);
|
|
||||||
return; // Take the first valid image
|
return; // Take the first valid image
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[form, maxSize, accept],
|
[converting, maxSize, accept, selectFile],
|
||||||
);
|
);
|
||||||
|
|
||||||
const onSubmit = useCallback(
|
const onSubmit = useCallback(
|
||||||
(data: z.infer<typeof formSchema>) => {
|
(data: z.infer<typeof formSchema>) => {
|
||||||
if (!data.file) return;
|
// the form still holds the previous image until a replacement
|
||||||
|
// finishes converting, so saving now would upload the wrong one
|
||||||
|
if (!data.file || converting) return;
|
||||||
onSave(data.file);
|
onSave(data.file);
|
||||||
},
|
},
|
||||||
[onSave],
|
[converting, onSave],
|
||||||
);
|
);
|
||||||
|
|
||||||
const clearSelection = () => {
|
const clearSelection = () => {
|
||||||
|
// drop any running conversion so it can't restore the selection
|
||||||
|
selectionId.current += 1;
|
||||||
|
setConverting(false);
|
||||||
form.reset();
|
form.reset();
|
||||||
setPreview(null);
|
setPreview(null);
|
||||||
};
|
};
|
||||||
@@ -142,21 +201,34 @@ export default function ImageEntry({
|
|||||||
"flex h-40 flex-col items-center justify-center rounded-lg border-2 border-dashed p-6 transition-colors",
|
"flex h-40 flex-col items-center justify-center rounded-lg border-2 border-dashed p-6 transition-colors",
|
||||||
isDragActive && "border-primary bg-primary/5",
|
isDragActive && "border-primary bg-primary/5",
|
||||||
isDragReject && "border-destructive bg-destructive/5",
|
isDragReject && "border-destructive bg-destructive/5",
|
||||||
"cursor-pointer hover:border-primary hover:bg-primary/5",
|
converting
|
||||||
|
? "cursor-wait"
|
||||||
|
: "cursor-pointer hover:border-primary hover:bg-primary/5",
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<input {...getInputProps()} />
|
<input {...getInputProps()} />
|
||||||
<LuUpload className="mb-2 h-10 w-10 text-muted-foreground" />
|
{converting ? (
|
||||||
<p className="text-center text-sm text-muted-foreground">
|
<>
|
||||||
{isDragActive
|
<ActivityIndicator className="mb-2" />
|
||||||
? t("imageEntry.dropActive")
|
<p className="text-center text-sm text-muted-foreground">
|
||||||
: t("imageEntry.dropInstructions")}
|
{t("imageEntry.converting")}
|
||||||
</p>
|
</p>
|
||||||
<p className="mt-1 text-xs text-muted-foreground">
|
</>
|
||||||
{t("imageEntry.maxSize", {
|
) : (
|
||||||
size: Math.round(maxSize / (1024 * 1024)),
|
<>
|
||||||
})}
|
<LuUpload className="mb-2 h-10 w-10 text-muted-foreground" />
|
||||||
</p>
|
<p className="text-center text-sm text-muted-foreground">
|
||||||
|
{isDragActive
|
||||||
|
? t("imageEntry.dropActive")
|
||||||
|
: t("imageEntry.dropInstructions")}
|
||||||
|
</p>
|
||||||
|
<p className="mt-1 text-xs text-muted-foreground">
|
||||||
|
{t("imageEntry.maxSize", {
|
||||||
|
size: Math.round(maxSize / (1024 * 1024)),
|
||||||
|
})}
|
||||||
|
</p>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="relative h-40 w-full">
|
<div className="relative h-40 w-full">
|
||||||
@@ -165,6 +237,14 @@ export default function ImageEntry({
|
|||||||
alt="Preview"
|
alt="Preview"
|
||||||
className="h-full w-full rounded-lg border object-contain"
|
className="h-full w-full rounded-lg border object-contain"
|
||||||
/>
|
/>
|
||||||
|
{converting && (
|
||||||
|
<div className="absolute inset-0 flex cursor-wait flex-col items-center justify-center rounded-lg bg-background/80">
|
||||||
|
<ActivityIndicator className="mb-2" />
|
||||||
|
<p className="text-center text-sm text-muted-foreground">
|
||||||
|
{t("imageEntry.converting")}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
<Button
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
variant="destructive"
|
variant="destructive"
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
// HEIC/HEIF is the default photo format on iPhones. The backend decodes
|
||||||
|
// uploads with OpenCV, which has no HEIC support, and only Safari can preview
|
||||||
|
// it, so HEIC images are converted to JPEG in the browser before upload.
|
||||||
|
|
||||||
|
export const HEIC_EXTENSIONS = [".heic", ".heif"];
|
||||||
|
|
||||||
|
const HEIC_MIME_TYPES = [
|
||||||
|
"image/heic",
|
||||||
|
"image/heif",
|
||||||
|
"image/heic-sequence",
|
||||||
|
"image/heif-sequence",
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check whether a file is HEIC/HEIF. The extension is checked as well as the
|
||||||
|
* MIME type because browsers on systems without a HEIF codec installed (such
|
||||||
|
* as Windows) report an empty type for these files.
|
||||||
|
*/
|
||||||
|
export function isHeicFile(file: File): boolean {
|
||||||
|
if (HEIC_MIME_TYPES.includes(file.type.toLowerCase())) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
const name = file.name.toLowerCase();
|
||||||
|
return HEIC_EXTENSIONS.some((extension) => name.endsWith(extension));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert a HEIC/HEIF file to a JPEG file. Orientation is applied during
|
||||||
|
* decoding, so the output pixels are already upright.
|
||||||
|
*/
|
||||||
|
export async function convertHeicToJpeg(file: File): Promise<File> {
|
||||||
|
// the decoder is a large WASM bundle, so it is only fetched when needed
|
||||||
|
const { heicTo } = await import("heic-to");
|
||||||
|
const jpeg = await heicTo({
|
||||||
|
blob: file,
|
||||||
|
type: "image/jpeg",
|
||||||
|
// faces are cropped and re-encoded by the backend, keep detail here
|
||||||
|
quality: 0.95,
|
||||||
|
});
|
||||||
|
const baseName = file.name.replace(/\.hei[cf]$/i, "") || "image";
|
||||||
|
|
||||||
|
return new File([jpeg], `${baseName}.jpg`, { type: "image/jpeg" });
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user