byte-codec 1.5.6 → 1.5.8

package/dist/index.cjs

@@ -195,20 +195,45 @@ function unfilterScanlines(data, height, bytesPerRow, bpp) {
 	}
 	return out;
 }
-function sumOfAbsSigned(bytes) {
+function filterRowInto(current, previous, bpp, filterType, target) {
 	let sum = 0;
-	for (const byte of bytes) sum += Math.min(byte, 256 - byte);
+	switch (filterType) {
+		case 1:
+			target.forEach((_byte, x) => {
+				const filtered = current[x + bpp] - current[x] & 255;
+				target[x] = filtered;
+				sum += Math.min(filtered, 256 - filtered);
+			});
+			break;
+		case 2:
+			target.forEach((_byte, x) => {
+				const filtered = current[x + bpp] - previous[x + bpp] & 255;
+				target[x] = filtered;
+				sum += Math.min(filtered, 256 - filtered);
+			});
+			break;
+		case 3:
+			target.forEach((_byte, x) => {
+				const filtered = current[x + bpp] - Math.floor((current[x] + previous[x + bpp]) / 2) & 255;
+				target[x] = filtered;
+				sum += Math.min(filtered, 256 - filtered);
+			});
+			break;
+		case 4:
+			target.forEach((_byte, x) => {
+				const filtered = current[x + bpp] - paethPredictor(current[x], previous[x + bpp], previous[x]) & 255;
+				target[x] = filtered;
+				sum += Math.min(filtered, 256 - filtered);
+			});
+			break;
+		case 0: target.forEach((_byte, x) => {
+			const filtered = current[x + bpp];
+			target[x] = filtered;
+			sum += Math.min(filtered, 256 - filtered);
+		});
+	}
 	return sum;
 }
-function filterRowInto(raw, rowStart, prevRowStart, bytesPerRow, bpp, filterType, out, outOffset) {
-	out.subarray(outOffset, outOffset + bytesPerRow).forEach((_byte, x) => {
-		const rawByte = raw[rowStart + x];
-		const a = x >= bpp ? raw[rowStart + x - bpp] : 0;
-		const b = prevRowStart === void 0 ? 0 : raw[prevRowStart + x];
-		const c = x >= bpp && prevRowStart !== void 0 ? raw[prevRowStart + x - bpp] : 0;
-		out[outOffset + x] = rawByte - predictorValue(filterType, a, b, c) & 255;
-	});
-}
 const ALL_FILTER_TYPES = [
 	0,
 	1,
@@ -219,31 +244,27 @@ const ALL_FILTER_TYPES = [
 function filterScanlines(raw, height, bytesPerRow, bpp, strategy = "adaptive") {
 	const stride = bytesPerRow + 1;
 	const out = new Uint8Array(height * stride);
-	const candidate = new Uint8Array(bytesPerRow);
-	for (let y = 0; y < height; y++) {
-		const rowStart = y * bytesPerRow;
-		const prevRowStart = y > 0 ? rowStart - bytesPerRow : void 0;
-		const outRowStart = y * stride;
-		if (strategy === "none") {
-			out[outRowStart] = 0;
-			filterRowInto(raw, rowStart, prevRowStart, bytesPerRow, bpp, 0, out, outRowStart + 1);
-			continue;
-		}
+	let current = new Uint8Array(bytesPerRow + bpp);
+	let previous = new Uint8Array(bytesPerRow + bpp);
+	let candidate = new Uint8Array(bytesPerRow);
+	let best = new Uint8Array(bytesPerRow);
+	const filterTypes = strategy === "none" ? [0] : ALL_FILTER_TYPES;
+	Array.from({ length: height }).forEach((_row, y) => {
+		current.set(raw.subarray(y * bytesPerRow, (y + 1) * bytesPerRow), bpp);
 		let bestType = 0;
 		let bestSum = Number.POSITIVE_INFINITY;
-		let best;
-		for (const filterType of ALL_FILTER_TYPES) {
-			filterRowInto(raw, rowStart, prevRowStart, bytesPerRow, bpp, filterType, candidate, 0);
-			const sum = sumOfAbsSigned(candidate);
+		for (const filterType of filterTypes) {
+			const sum = filterRowInto(current, previous, bpp, filterType, candidate);
 			if (sum < bestSum) {
 				bestSum = sum;
 				bestType = filterType;
-				best = candidate.slice();
+				[best, candidate] = [candidate, best];
 			}
 		}
-		out[outRowStart] = bestType;
-		if (best !== void 0) out.set(best, outRowStart + 1);
-	}
+		out[y * stride] = bestType;
+		out.set(best, y * stride + 1);
+		[previous, current] = [current, previous];
+	});
 	return out;
 }
 //#endregion
@@ -432,15 +453,19 @@ function channelsForColorType(colorType) {
 function filterBpp(bitDepth, channels) {
 	return Math.max(1, Math.ceil(bitDepth * channels / 8));
 }
-function unpackRow(rowBytes, width, channels, bitDepth) {
-	const sampleCount = width * channels;
-	if (bitDepth === 16) return Array.from({ length: sampleCount }, (_, i) => rowBytes[i * 2]);
+function unpackRow(rowBytes, samples, bitDepth) {
+	if (bitDepth === 16) {
+		samples.forEach((_sample, i) => {
+			samples[i] = rowBytes[i * 2];
+		});
+		return;
+	}
 	const mask = (1 << bitDepth) - 1;
-	return Array.from({ length: sampleCount }, (_, i) => {
+	samples.forEach((_sample, i) => {
 		const bitOffset = i * bitDepth;
 		const byteIndex = bitOffset >> 3;
 		const shift = 8 - bitDepth - (bitOffset & 7);
-		return rowBytes[byteIndex] >> shift & mask;
+		samples[i] = rowBytes[byteIndex] >> shift & mask;
 	});
 }
 function readTrnsGrayValue(trns) {
@@ -486,10 +511,12 @@ function buildRawImage(ihdr, channels, bytesPerRow, unfiltered, palette, trns) {
 	const alpha = colorType === 4 || colorType === 6 || trns !== void 0 ? new Uint8Array(width * height).fill(255) : void 0;
 	const trnsGray = colorType === 0 && trns !== void 0 ? readTrnsGrayValue(trns) : void 0;
 	const trnsRgb = colorType === 2 && trns !== void 0 ? readTrnsRgbKey(trns) : void 0;
-	for (const y of Array.from({ length: height }, (_, i) => i)) {
+	const samples = new Uint8Array(width * channels);
+	const columns = new Uint32Array(width);
+	Array.from({ length: height }).forEach((_row, y) => {
 		const rowStart = y * bytesPerRow;
-		const samples = unpackRow(unfiltered.subarray(rowStart, rowStart + bytesPerRow), width, channels, bitDepth);
-		for (const x of Array.from({ length: width }, (_, i) => i)) {
+		unpackRow(unfiltered.subarray(rowStart, rowStart + bytesPerRow), samples, bitDepth);
+		columns.forEach((_column, x) => {
 			const pixelBase = x * channels;
 			const outBase = (y * width + x) * outChannels;
 			const alphaIndex = y * width + x;
@@ -525,8 +552,8 @@ function buildRawImage(ihdr, channels, bytesPerRow, unfiltered, palette, trns) {
 				data[outBase + 2] = samples[pixelBase + 2];
 				if (alpha !== void 0) alpha[alphaIndex] = samples[pixelBase + 3];
 			}
-		}
-	}
+		});
+	});
 	return alpha === void 0 ? {
 		width,
 		height,

package/dist/index.js

@@ -194,20 +194,45 @@ function unfilterScanlines(data, height, bytesPerRow, bpp) {
 	}
 	return out;
 }
-function sumOfAbsSigned(bytes) {
+function filterRowInto(current, previous, bpp, filterType, target) {
 	let sum = 0;
-	for (const byte of bytes) sum += Math.min(byte, 256 - byte);
+	switch (filterType) {
+		case 1:
+			target.forEach((_byte, x) => {
+				const filtered = current[x + bpp] - current[x] & 255;
+				target[x] = filtered;
+				sum += Math.min(filtered, 256 - filtered);
+			});
+			break;
+		case 2:
+			target.forEach((_byte, x) => {
+				const filtered = current[x + bpp] - previous[x + bpp] & 255;
+				target[x] = filtered;
+				sum += Math.min(filtered, 256 - filtered);
+			});
+			break;
+		case 3:
+			target.forEach((_byte, x) => {
+				const filtered = current[x + bpp] - Math.floor((current[x] + previous[x + bpp]) / 2) & 255;
+				target[x] = filtered;
+				sum += Math.min(filtered, 256 - filtered);
+			});
+			break;
+		case 4:
+			target.forEach((_byte, x) => {
+				const filtered = current[x + bpp] - paethPredictor(current[x], previous[x + bpp], previous[x]) & 255;
+				target[x] = filtered;
+				sum += Math.min(filtered, 256 - filtered);
+			});
+			break;
+		case 0: target.forEach((_byte, x) => {
+			const filtered = current[x + bpp];
+			target[x] = filtered;
+			sum += Math.min(filtered, 256 - filtered);
+		});
+	}
 	return sum;
 }
-function filterRowInto(raw, rowStart, prevRowStart, bytesPerRow, bpp, filterType, out, outOffset) {
-	out.subarray(outOffset, outOffset + bytesPerRow).forEach((_byte, x) => {
-		const rawByte = raw[rowStart + x];
-		const a = x >= bpp ? raw[rowStart + x - bpp] : 0;
-		const b = prevRowStart === void 0 ? 0 : raw[prevRowStart + x];
-		const c = x >= bpp && prevRowStart !== void 0 ? raw[prevRowStart + x - bpp] : 0;
-		out[outOffset + x] = rawByte - predictorValue(filterType, a, b, c) & 255;
-	});
-}
 const ALL_FILTER_TYPES = [
 	0,
 	1,
@@ -218,31 +243,27 @@ const ALL_FILTER_TYPES = [
 function filterScanlines(raw, height, bytesPerRow, bpp, strategy = "adaptive") {
 	const stride = bytesPerRow + 1;
 	const out = new Uint8Array(height * stride);
-	const candidate = new Uint8Array(bytesPerRow);
-	for (let y = 0; y < height; y++) {
-		const rowStart = y * bytesPerRow;
-		const prevRowStart = y > 0 ? rowStart - bytesPerRow : void 0;
-		const outRowStart = y * stride;
-		if (strategy === "none") {
-			out[outRowStart] = 0;
-			filterRowInto(raw, rowStart, prevRowStart, bytesPerRow, bpp, 0, out, outRowStart + 1);
-			continue;
-		}
+	let current = new Uint8Array(bytesPerRow + bpp);
+	let previous = new Uint8Array(bytesPerRow + bpp);
+	let candidate = new Uint8Array(bytesPerRow);
+	let best = new Uint8Array(bytesPerRow);
+	const filterTypes = strategy === "none" ? [0] : ALL_FILTER_TYPES;
+	Array.from({ length: height }).forEach((_row, y) => {
+		current.set(raw.subarray(y * bytesPerRow, (y + 1) * bytesPerRow), bpp);
 		let bestType = 0;
 		let bestSum = Number.POSITIVE_INFINITY;
-		let best;
-		for (const filterType of ALL_FILTER_TYPES) {
-			filterRowInto(raw, rowStart, prevRowStart, bytesPerRow, bpp, filterType, candidate, 0);
-			const sum = sumOfAbsSigned(candidate);
+		for (const filterType of filterTypes) {
+			const sum = filterRowInto(current, previous, bpp, filterType, candidate);
 			if (sum < bestSum) {
 				bestSum = sum;
 				bestType = filterType;
-				best = candidate.slice();
+				[best, candidate] = [candidate, best];
 			}
 		}
-		out[outRowStart] = bestType;
-		if (best !== void 0) out.set(best, outRowStart + 1);
-	}
+		out[y * stride] = bestType;
+		out.set(best, y * stride + 1);
+		[previous, current] = [current, previous];
+	});
 	return out;
 }
 //#endregion
@@ -431,15 +452,19 @@ function channelsForColorType(colorType) {
 function filterBpp(bitDepth, channels) {
 	return Math.max(1, Math.ceil(bitDepth * channels / 8));
 }
-function unpackRow(rowBytes, width, channels, bitDepth) {
-	const sampleCount = width * channels;
-	if (bitDepth === 16) return Array.from({ length: sampleCount }, (_, i) => rowBytes[i * 2]);
+function unpackRow(rowBytes, samples, bitDepth) {
+	if (bitDepth === 16) {
+		samples.forEach((_sample, i) => {
+			samples[i] = rowBytes[i * 2];
+		});
+		return;
+	}
 	const mask = (1 << bitDepth) - 1;
-	return Array.from({ length: sampleCount }, (_, i) => {
+	samples.forEach((_sample, i) => {
 		const bitOffset = i * bitDepth;
 		const byteIndex = bitOffset >> 3;
 		const shift = 8 - bitDepth - (bitOffset & 7);
-		return rowBytes[byteIndex] >> shift & mask;
+		samples[i] = rowBytes[byteIndex] >> shift & mask;
 	});
 }
 function readTrnsGrayValue(trns) {
@@ -485,10 +510,12 @@ function buildRawImage(ihdr, channels, bytesPerRow, unfiltered, palette, trns) {
 	const alpha = colorType === 4 || colorType === 6 || trns !== void 0 ? new Uint8Array(width * height).fill(255) : void 0;
 	const trnsGray = colorType === 0 && trns !== void 0 ? readTrnsGrayValue(trns) : void 0;
 	const trnsRgb = colorType === 2 && trns !== void 0 ? readTrnsRgbKey(trns) : void 0;
-	for (const y of Array.from({ length: height }, (_, i) => i)) {
+	const samples = new Uint8Array(width * channels);
+	const columns = new Uint32Array(width);
+	Array.from({ length: height }).forEach((_row, y) => {
 		const rowStart = y * bytesPerRow;
-		const samples = unpackRow(unfiltered.subarray(rowStart, rowStart + bytesPerRow), width, channels, bitDepth);
-		for (const x of Array.from({ length: width }, (_, i) => i)) {
+		unpackRow(unfiltered.subarray(rowStart, rowStart + bytesPerRow), samples, bitDepth);
+		columns.forEach((_column, x) => {
 			const pixelBase = x * channels;
 			const outBase = (y * width + x) * outChannels;
 			const alphaIndex = y * width + x;
@@ -524,8 +551,8 @@ function buildRawImage(ihdr, channels, bytesPerRow, unfiltered, palette, trns) {
 				data[outBase + 2] = samples[pixelBase + 2];
 				if (alpha !== void 0) alpha[alphaIndex] = samples[pixelBase + 3];
 			}
-		}
-	}
+		});
+	});
 	return alpha === void 0 ? {
 		width,
 		height,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "byte-codec",
-  "version": "1.5.6",
+  "version": "1.5.8",
   "description": "Generic byte-level primitives (ByteWriter, ByteReader, CRC-32, deflate/inflate) and PNG/JPEG image encoding/decoding with zero PDF knowledge — the shared utility package for the documents.js family.",
   "type": "module",
   "repository": {