Merge e74e108297 into 438f91aa0c

docs/FAQ.md

@@ -8,6 +8,7 @@ This file covers frequently asked questions.
 - [What about analytics?](#what-about-analytics)
 - [What libraries does VERT use?](#what-libraries-does-vert-use)
 - [Is it possible to fully prevent VERT from making requests to external services?](#is-it-possible-to-fully-prevent-vert-from-making-requests-to-external-services)
+- [What about RAW camera files (DNG, NEF, CR2, etc.)?](#what-about-raw-camera-files-dng-nef-cr2-etc)
 
 ### Why VERT?
 
@@ -34,4 +35,9 @@ Yes! If you would prefer VERT to not make any requests to external services (vid
 The only external request VERT will make with this option is to `cdn.jsdelivr.net`, which is used to download FFmpeg's WebAssembly build.
 
 ### What libraries does VERT use?
-VERT uses FFmpeg for audio and video conversion, imagemagick for images and Pandoc for documents. A big thanks to them for maintaining such excellent libraries for so many years.
+
+VERT uses FFmpeg for audio and video conversion, imagemagick for images and Pandoc for documents. A big thanks to them for maintaining such excellent libraries for so many years.
+
+### What about RAW camera files (DNG, NEF, CR2, etc.)?
+
+ImageMagick's WebAssembly build doesn't include the RAW demosaicing code (libraw/dcraw), so VERT can't develop sensor data directly in the browser. Instead, VERT extracts the full-resolution JPEG preview that cameras embed inside the RAW file and converts that. In practice this gives you the same image the camera would have produced as a JPEG — white balance, tone curve and all — which is what most people want. If a RAW file happens to have no embedded preview, the conversion will fail with a friendly error rather than producing a garbled image.

src/lib/util/parse/raw.ts

@@ -0,0 +1,198 @@
+// Extracts an embedded JPEG preview from a TIFF-based camera RAW file
+// (DNG, NEF, CR2, ARW, RAF, ORF, PEF, RW2, NRW, SRW, 3FR, ERF, MEF,
+// MOS, MRW, SR2, SRF, DCR, etc.).
+//
+// magick-wasm does not include libraw/dcraw, so it cannot demosaic the
+// sensor data inside a RAW file -- handing the raw bytes to ImageMagick
+// produces a rainbow CFA mosaic. The DNG spec (and every camera vendor
+// in practice) embeds a full-resolution JPEG preview inside the TIFF
+// container. We parse just enough of the TIFF directory here to find
+// the largest embedded JPEG and hand that to the rest of the pipeline.
+
+// TIFF tags we care about
+const TAG_COMPRESSION = 0x0103;
+const TAG_STRIP_OFFSETS = 0x0111;
+const TAG_STRIP_BYTE_COUNTS = 0x0117;
+const TAG_JPEG_IF_OFFSET = 0x0201; // legacy JPEGInterchangeFormat
+const TAG_JPEG_IF_LENGTH = 0x0202;
+const TAG_SUB_IFDS = 0x014a;
+
+const COMPRESSION_OLD_JPEG = 6;
+const COMPRESSION_NEW_JPEG = 7;
+
+type Entry = {
+	tag: number;
+	type: number;
+	count: number;
+	valueOffset: number;
+	entryPos: number; // file offset of this 12-byte entry
+};
+
+type Candidate = { offset: number; length: number };
+
+const TYPE_SIZE: Record<number, number> = {
+	1: 1, // BYTE
+	2: 1, // ASCII
+	3: 2, // SHORT
+	4: 4, // LONG
+	5: 8, // RATIONAL
+	7: 1, // UNDEFINED
+	9: 4, // SLONG
+	10: 8, // SRATIONAL
+};
+
+/**
+ * Extracts the largest embedded JPEG preview from a TIFF-based camera
+ * RAW file (DNG, NEF, CR2, ARW, RAF, ORF, PEF, RW2, NRW, SRW, 3FR,
+ * ERF, MEF, MOS, MRW, SR2, SRF, DCR, etc.).
+ *
+ * Walks the TIFF IFD chain (including SubIFDs) looking for an
+ * IFD whose strips are JPEG-compressed, or for the legacy
+ * `JPEGInterchangeFormat` / `JPEGInterchangeFormatLength` tag pair.
+ * Candidates are validated by checking for a JPEG SOI marker (`FF D8`)
+ * at the reported offset, and the largest valid candidate (typically
+ * the full-resolution preview) is returned.
+ *
+ * Intended for the magick-wasm pipeline, which has no libraw/dcraw and
+ * therefore cannot demosaic RAW sensor data directly.
+ *
+ * @param buf Raw file bytes.
+ * @returns Bytes of the embedded JPEG preview, ready to be decoded.
+ * @throws If the input is not a TIFF-based RAW or contains no usable
+ *         embedded JPEG preview.
+ */
+export function extractRawPreview(buf: Uint8Array): Uint8Array {
+	if (buf.length < 8) throw new Error("file too small to be TIFF/RAW");
+
+	const dv = new DataView(buf.buffer, buf.byteOffset, buf.byteLength);
+	let little: boolean;
+	if (buf[0] === 0x49 && buf[1] === 0x49) little = true;
+	else if (buf[0] === 0x4d && buf[1] === 0x4d) little = false;
+	else throw new Error("not a TIFF-based RAW (bad byte-order mark)");
+
+	const magic = dv.getUint16(2, little);
+	// Standard TIFF magic is 42; some RAWs use other magics (e.g. ORF
+	// uses 0x4f52/0x5352, CR2 uses 42 with a CR2 sub-header). 42 covers
+	// DNG, NEF, ARW, PEF, RW2, etc. -- accept anything reasonable and
+	// rely on the directory parse to fail cleanly if it's not TIFF-ish.
+	if (magic !== 42 && magic !== 0x4f52 && magic !== 0x5352 && magic !== 0x55)
+		throw new Error(`unsupported TIFF variant (magic=${magic})`);
+
+	const firstIfd = dv.getUint32(4, little);
+	const candidates: Candidate[] = [];
+	const seen = new Set<number>();
+
+	const walk = (ifdOffset: number) => {
+		if (ifdOffset === 0 || seen.has(ifdOffset)) return;
+		if (ifdOffset + 2 > buf.length) return;
+		seen.add(ifdOffset);
+
+		const count = dv.getUint16(ifdOffset, little);
+		const entriesStart = ifdOffset + 2;
+		if (entriesStart + count * 12 > buf.length) return;
+
+		const entries = new Map<number, Entry>();
+		for (let i = 0; i < count; i++) {
+			const p = entriesStart + i * 12;
+			entries.set(dv.getUint16(p, little), {
+				tag: dv.getUint16(p, little),
+				type: dv.getUint16(p + 2, little),
+				count: dv.getUint32(p + 4, little),
+				valueOffset: dv.getUint32(p + 8, little),
+				entryPos: p,
+			});
+		}
+
+		const readValues = (e: Entry): number[] => {
+			const size = TYPE_SIZE[e.type] ?? 0;
+			if (size === 0) return [];
+			const total = size * e.count;
+			const base = total <= 4 ? e.entryPos + 8 : e.valueOffset;
+			if (base + total > buf.length) return [];
+			const out: number[] = [];
+			for (let i = 0; i < e.count; i++) {
+				const off = base + i * size;
+				if (e.type === 3) out.push(dv.getUint16(off, little));
+				else if (e.type === 4) out.push(dv.getUint32(off, little));
+				else if (e.type === 1 || e.type === 7) out.push(buf[off]);
+			}
+			return out;
+		};
+
+		// Check this IFD for an embedded JPEG.
+		const compressionEntry = entries.get(TAG_COMPRESSION);
+		const compression = compressionEntry
+			? readValues(compressionEntry)[0]
+			: undefined;
+
+		// Modern path: single-strip JPEG (DNG full-size preview, most RAWs).
+		if (
+			compression === COMPRESSION_NEW_JPEG ||
+			compression === COMPRESSION_OLD_JPEG
+		) {
+			const offEntry = entries.get(TAG_STRIP_OFFSETS);
+			const lenEntry = entries.get(TAG_STRIP_BYTE_COUNTS);
+			if (offEntry && lenEntry) {
+				const offs = readValues(offEntry);
+				const lens = readValues(lenEntry);
+				if (offs.length && offs.length === lens.length) {
+					// Only treat as a usable preview if the strip data
+					// begins with a JPEG SOI marker (FF D8).
+					const o = offs[0];
+					if (
+						o + 2 <= buf.length &&
+						buf[o] === 0xff &&
+						buf[o + 1] === 0xd8
+					) {
+						const total = lens.reduce((a, b) => a + b, 0);
+						candidates.push({ offset: o, length: total });
+					}
+				}
+			}
+		}
+
+		// Legacy path: JPEGInterchangeFormat / Length (used by CR2 IFD0
+		// preview, older NEFs, etc.).
+		const jOff = entries.get(TAG_JPEG_IF_OFFSET);
+		const jLen = entries.get(TAG_JPEG_IF_LENGTH);
+		if (jOff && jLen) {
+			const o = readValues(jOff)[0];
+			const l = readValues(jLen)[0];
+			if (
+				o &&
+				l &&
+				o + 2 <= buf.length &&
+				buf[o] === 0xff &&
+				buf[o + 1] === 0xd8
+			) {
+				candidates.push({ offset: o, length: l });
+			}
+		}
+
+		// Recurse into SubIFDs (where DNG puts its full-size preview).
+		const sub = entries.get(TAG_SUB_IFDS);
+		if (sub) {
+			for (const off of readValues(sub)) walk(off);
+		}
+
+		// Continue to next IFD in chain.
+		const nextOff = entriesStart + count * 12;
+		if (nextOff + 4 <= buf.length) {
+			walk(dv.getUint32(nextOff, little));
+		}
+	};
+
+	walk(firstIfd);
+
+	if (candidates.length === 0) {
+		throw new Error(
+			"no embedded JPEG preview found in RAW file -- VERT can only convert RAW files that contain an embedded preview",
+		);
+	}
+
+	// Pick the largest preview (full-resolution beats thumbnail).
+	candidates.sort((a, b) => b.length - a.length);
+	const pick = candidates[0];
+	const end = Math.min(pick.offset + pick.length, buf.length);
+	return buf.slice(pick.offset, end);
+}

src/lib/workers/magick.ts

@@ -8,6 +8,7 @@ import {
 } from "@imagemagick/magick-wasm";
 import { makeZip } from "client-zip";
 import { parseAni } from "$lib/util/parse/ani";
+import { extractRawPreview } from "$lib/util/parse/raw";
 import { parseIcns } from "vert-wasm";
 import type { WorkerMessage } from "$lib/types";
 
@@ -241,13 +242,47 @@ const handleMessage = async (
 				};
 			}
 
+			// Camera RAW formats: magick-wasm has no libraw/dcraw, so
+			// feeding it sensor data yields a rainbow CFA mosaic.
+			// Instead, extract the embedded JPEG preview that DNG (and
+			// nearly every other TIFF-based RAW) carries, and let the
+			// rest of the pipeline convert that.
+			const RAW_FORMATS = new Set([
+				"dng", "nef", "cr2", "arw", "raf", "orf", "pef", "rw2",
+				"nrw", "srw", "3fr", "erf", "mef", "mos", "mrw", "sr2",
+				"srf", "dcr", "crw", "raw",
+			]);
+			let readBuffer = new Uint8Array(buffer);
+			let readFrom = from;
+			let fromRaw = false;
+			if (RAW_FORMATS.has(from.slice(1))) {
+				try {
+					readBuffer = extractRawPreview(readBuffer);
+					readFrom = ".jpeg";
+					fromRaw = true;
+				} catch (e) {
+					return {
+						type: "error",
+						error: `Could not convert RAW file: ${(e as Error).message}`,
+					};
+				}
+			}
+
 			const img = MagickImage.create(
-				new Uint8Array(buffer),
+				readBuffer,
 				new MagickReadSettings({
-					format: from.slice(1).toUpperCase() as MagickFormat,
+					format: readFrom.slice(1).toUpperCase() as MagickFormat,
 				}),
 			);
 
+			// The embedded JPEG preview from a RAW carries an EXIF
+			// Orientation tag (e.g. portrait phone shots store landscape
+			// pixels + an "rotate 90" hint). JPEG output preserves that
+			// tag, but PNG/WebP/etc. have no orientation metadata --
+			// bake the rotation into the pixels so every target format
+			// looks right.
+			if (fromRaw) img.autoOrient();
+
 			const converted = await magickConvert(
 				img,
 				message.to,