Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
perf(ocr): swap the rendered page's channels in place
Elian Doranb2cae0f53b5b
diff --git a/apps/server/src/services/ocr/pdf_renderer.ts b/apps/server/src/services/ocr/pdf_renderer.tsindex 104baef973..27f874483f 100644--- a/apps/server/src/services/ocr/pdf_renderer.ts+++ b/apps/server/src/services/ocr/pdf_renderer.ts@@ -4,7 +4,10 @@ import path from "path";import { RESOURCE_DIR } from "../resource_dir.js";-/** A page rasterized to 8-bit BGRA, four bytes per pixel. */+/**+ * A page rasterized to 8-bit BGRA, four bytes per pixel. Each render allocates its own buffer, so+ * the caller is free to convert it in place.+ */export interface RenderedPage {data: Uint8Array;width: number;diff --git a/apps/server/src/services/ocr/processors/pdf_processor.spec.ts b/apps/server/src/services/ocr/processors/pdf_processor.spec.tsindex 3736246344..cfb1a06a06 100644--- a/apps/server/src/services/ocr/processors/pdf_processor.spec.ts+++ b/apps/server/src/services/ocr/processors/pdf_processor.spec.ts@@ -52,7 +52,7 @@ beforeEach(async () => {mockGetPage.mockImplementation(async () => ({ getViewport: mockGetViewport }));mockGetDocumentProxy.mockResolvedValue(pdfProxy);mockGetBuffer.mockResolvedValue(Buffer.from('png-bytes'));- mockRenderPage.mockResolvedValue(renderedPage);+ mockRenderPage.mockImplementation(async () => renderedPage());({ PDFProcessor } = await import('./pdf_processor.js'));});@@ -61,8 +61,14 @@ afterEach(() => {});const buffer = Buffer.from('%PDF-1.4 fake');-/** A page as the renderer returns it: four BGRA bytes per pixel. */-const renderedPage = { data: new Uint8Array(100 * 60 * 4), width: 100, height: 60 };++/**+ * A page as the renderer returns it: four BGRA bytes per pixel, in a buffer of its own. Built fresh+ * per call because the processor converts the page in place.+ */+function renderedPage() {+ return { data: new Uint8Array(100 * 60 * 4), width: 100, height: 60 };+}/** Embedded text dense enough for a Letter page to read as a real text layer rather than a scan. */function densePage(marker: string): string {diff --git a/apps/server/src/services/ocr/processors/pdf_processor.ts b/apps/server/src/services/ocr/processors/pdf_processor.tsindex 7051258af6..4223706a64 100644--- a/apps/server/src/services/ocr/processors/pdf_processor.ts+++ b/apps/server/src/services/ocr/processors/pdf_processor.ts@@ -153,20 +153,21 @@ async function getPageArea(pdf: PdfDocument, pageNum: number): Promise<number> {/*** Encode a rendered page into a PNG buffer that Tesseract can decode. The renderer produces BGRA- * and Jimp bitmaps are RGBA, so the blue and red channels swap places. Alpha is forced opaque: a- * transparent page background would otherwise reach Tesseract as black.+ * and Jimp bitmaps are RGBA, so blue and red swap places within the page's own buffer: it belongs+ * to this call and is dropped as soon as the PNG exists, and a full-page copy to swap two channels+ * costs 8 MB for nothing. Alpha is forced opaque, or a transparent page background would reach+ * Tesseract as black.*/async function toPngBuffer({ data, width, height }: RenderedPage): Promise<Buffer> {- const rgba = Buffer.alloc(width * height * 4);- for (let i = 0; i < width * height; i++) {- const out = i * 4;- rgba[out] = data[out + 2];- rgba[out + 1] = data[out + 1];- rgba[out + 2] = data[out];- rgba[out + 3] = 255;+ const bitmap = Buffer.from(data.buffer, data.byteOffset, data.byteLength);+ for (let i = 0; i < bitmap.length; i += 4) {+ const blue = bitmap[i];+ bitmap[i] = bitmap[i + 2];+ bitmap[i + 2] = blue;+ bitmap[i + 3] = 255;}// Dynamically imported so jimp only loads when a page is actually rasterized.const { Jimp } = await import("jimp");- return Jimp.fromBitmap({ data: rgba, width, height }).getBuffer("image/png");+ return Jimp.fromBitmap({ data: bitmap, width, height }).getBuffer("image/png");}