3dtours
224ff0b935
LibRaw's half-size demosaic was on. The Ricoh GR's own DNG (D0004128.DNG) developed to 3010x2012 while the JPEG written beside it in the same second is 6000x4000, and the Fuji's RAF to 3008x2007 against its own 6000x4000 -- the quarter was the flag, not the file. With `halfSize: false` the same develop returns 6020x4024 and it is the sensor's frame on every body tried: D0004128.DNG 6020x4024 IMGP6916.DNG 6028x4024 DSCF1701.RAF 6016x4014 _DSC0009.ARW 6024x4024 AFXT2721.RAF 6246x4170 Nikon-D850 NEF 6216x4136 _GDN0447.NEF 4284x2844 P1010607.RW2 3472x3472 5G4A9396.CR2 2880x1920 Nine files, 27s to 155s a develop on one core. Checked through the app itself, not only through LibRaw: photo-dims 6020x4024 on the DNG against 6000x4000 on the JPEG, both err none. The colour it opens with is now fitted per file to the preview the camera wrote into it (previewMatch.ts): a 3x3 over a block grid of the develop against the same grid of that preview, then one cubic a channel for what the 3x3 leaves. The offline per-body table this replaces (cameraMatch.ts) stopped matching the moment the path under it changed -- its rows no longer summed to 1 once the highlight knee landed ahead of it -- and a body with a row opened with a cast one without did not. The file's own preview does not age. The white level the gain carries is the frame's own plateau rather than `maximum` (sensorWhite.ts), a factor of 1.89 to 2.00 out; without it every frame opened a stop bright and a body that sat lower (X-Trans, 1.892) never reached the highlight desaturation at all. The desaturation gate reads the gain-lifted levels as well as the sensor's, which is the whole of the magenta: on a body whose cam_mul lifts red and blue (the GR's [2.64, 1, 1.73]) a blown sky crosses the white level at 0.38 of the raw range in red while green crosses at 1.0, so a gate read on the sensor's levels alone stayed shut across it. Measured in the app against the camera's own JPEG, mean dRGB over a 16x16 block grid: +1.20, -5.95, -6.11 with the sensor's clip alone, +0.21, +0.24, +0.47 with both, mean |dL| 21.5 against 10.3. The same grid on the Fuji comes back balanced (+4.7, +5.0, +3.6) and best aligned at offset 0,0. -HL is recovery and +HL is a lift, so they are different moves now: recovery is the doc's soft knee in linear light over the top half, which is the only term in the tone shader that is not a shift and the only one that can put detail back into a blown sky rather than merely darken it. The four checks pin the develop down where it can only run in a browser: raw-develop-check, preview-match-check, white-level-check, highlight-knee-check.
103 lines
4.6 KiB
JavaScript
103 lines
4.6 KiB
JavaScript
// The per-file colour fit is pure arithmetic, so it can be checked here rather
|
|
// than in a browser: hand fitMatch a grid and the same grid through a known 3x3,
|
|
// and it has to hand that 3x3 back. Done that way because the function only ever
|
|
// runs inside the RAW develop, which needs LibRaw and CanvasKit — neither of
|
|
// which a node check has. The module is TypeScript, so it is transpiled on the
|
|
// fly out of the installed compiler (the repo's convention for checks: see
|
|
// raw-develop-check.mjs, which reads the shader source instead).
|
|
//
|
|
// node scripts/preview-match-check.mjs
|
|
import assert from 'node:assert/strict';
|
|
import { readFileSync } from 'node:fs';
|
|
import ts from 'typescript';
|
|
|
|
const file = new URL('../src/engine/previewMatch.ts', import.meta.url);
|
|
const js = ts.transpileModule(readFileSync(file, 'utf8'), {
|
|
compilerOptions: { module: ts.ModuleKind.ESNext, target: ts.ScriptTarget.ES2022 },
|
|
}).outputText;
|
|
const { fitMatch, MATCH_GRID } = await import(
|
|
`data:text/javascript;base64,${Buffer.from(js).toString('base64')}`
|
|
);
|
|
|
|
// A grid with colour in it: three independent ramps, none of them clipped and
|
|
// none at the floor, so every block carries something to fit. Independent on
|
|
// purpose — three correlated channels leave the 3x3 ill-conditioned, and a fit
|
|
// that comes back a percent off on such a scene says nothing about the code.
|
|
function scene() {
|
|
let s = 1;
|
|
const rnd = () => ((s = (s * 1103515245 + 12345) & 0x7fffffff) % 4096) / 4096;
|
|
const g = new Uint8Array(MATCH_GRID * MATCH_GRID * 4);
|
|
for (let i = 0; i < MATCH_GRID * MATCH_GRID; i++) {
|
|
for (let c = 0; c < 3; c++) g[i * 4 + c] = 25 + Math.round(rnd() * 190);
|
|
g[i * 4 + 3] = 255;
|
|
}
|
|
return g;
|
|
}
|
|
|
|
const M = [1.06, -0.05, 0.01, 0.02, 0.98, 0.03, -0.04, 0.06, 1.02];
|
|
const dev = scene();
|
|
const ref = new Uint8Array(dev.length);
|
|
for (let i = 0; i < MATCH_GRID * MATCH_GRID; i++) {
|
|
const e = [dev[i * 4], dev[i * 4 + 1], dev[i * 4 + 2]];
|
|
for (let r = 0; r < 3; r++) {
|
|
const v = M[r * 3] * e[0] + M[r * 3 + 1] * e[1] + M[r * 3 + 2] * e[2];
|
|
ref[i * 4 + r] = Math.max(0, Math.min(255, Math.round(v)));
|
|
}
|
|
ref[i * 4 + 3] = 255;
|
|
}
|
|
|
|
const fit = fitMatch(dev, ref);
|
|
assert.ok(fit, 'a fitted grid has to fit');
|
|
for (let r = 0; r < 3; r++) {
|
|
for (let c = 0; c < 3; c++) {
|
|
assert.ok(Math.abs(fit.m[r * 3 + c] - M[r * 3 + c]) < 0.01, `recovered ${fit.m[r * 3 + c]} for ${M[r * 3 + c]}`);
|
|
}
|
|
}
|
|
// This scene was made by a 3x3 and nothing else, so the curve fitted on what the
|
|
// 3x3 leaves has to come back flat — the identity, up to the rounding the scene
|
|
// carries.
|
|
assert.equal(fit.tone.length, 12);
|
|
for (let i = 0; i < 12; i++) {
|
|
const flat = i % 4 === 1 ? 1 : 0;
|
|
assert.ok(Math.abs(fit.tone[i] - flat) < 0.15, `tone ${i} came back ${fit.tone[i]}, not ${flat}`);
|
|
}
|
|
|
|
// Nothing to fit against: the camera clipped the whole frame, so no block says
|
|
// anything about its rendering, and the caller develops as the sensor left it.
|
|
assert.equal(fitMatch(dev, new Uint8Array(dev.length).fill(255)), null);
|
|
|
|
// A near-neutral frame through a matrix whose rows carry a negative element — what
|
|
// the bodies the fit used to refuse looked like (X-T3 -0.04, X100V -1.67 on rows
|
|
// that also carry +1.05 and +1.63). Three channels that share nearly all their
|
|
// content leave the normal equations near-singular, and the plain solve came back
|
|
// with a diagonal element at or below zero, which the caller read as a degeneracy
|
|
// and dropped the whole fit for. It is a colour: the ridge lifts the system back
|
|
// to definite and the fit has to come back a matrix.
|
|
function neutral() {
|
|
let s = 7;
|
|
const rnd = () => ((s = (s * 1103515245 + 12345) & 0x7fffffff) % 4096) / 4096;
|
|
const g = new Uint8Array(MATCH_GRID * MATCH_GRID * 4);
|
|
for (let i = 0; i < MATCH_GRID * MATCH_GRID; i++) {
|
|
const x = 40 + Math.round(rnd() * 180);
|
|
for (let c = 0; c < 3; c++) g[i * 4 + c] = Math.max(0, Math.min(255, x + Math.round((rnd() - 0.5) * 8)));
|
|
g[i * 4 + 3] = 255;
|
|
}
|
|
return g;
|
|
}
|
|
const N = [1.05, -1.67, 1.63, 0.02, 0.95, 0.03, -0.04, 0.06, 1.02];
|
|
const nDev = neutral();
|
|
const nRef = new Uint8Array(nDev.length);
|
|
for (let i = 0; i < MATCH_GRID * MATCH_GRID; i++) {
|
|
const e = [nDev[i * 4], nDev[i * 4 + 1], nDev[i * 4 + 2]];
|
|
for (let r = 0; r < 3; r++) {
|
|
const v = N[r * 3] * e[0] + N[r * 3 + 1] * e[1] + N[r * 3 + 2] * e[2];
|
|
nRef[i * 4 + r] = Math.max(0, Math.min(255, Math.round(v)));
|
|
}
|
|
nRef[i * 4 + 3] = 255;
|
|
}
|
|
const nFit = fitMatch(nDev, nRef);
|
|
assert.ok(nFit, 'a near-neutral frame has to fit, not come back null');
|
|
for (const v of nFit.m) assert.ok(Number.isFinite(v) && Math.abs(v) <= 4, `degenerate fit ${v}`);
|
|
|
|
console.log('preview-match-check ok');
|