mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-18 16:24:38 +00:00
Merge pull request #2039 from agstrc/craft-raw-sony-zv-e10-distortion
craft-raw: Sony ZV-E10 in-file distortion
This commit is contained in:
2 files changed
+76
-13
No files matched your search
@@ -7,7 +7,7 @@ chromatic aberration (CA). LightCraft reads them and turns distortion into a DNG
|
||||
reaches the same **Optics ▸ Enable Lens Corrections** (`optics.lens_profile`) as a DNG's embedded warp and Panasonic's
|
||||
RW2 distortion data. Lateral CA is parsed and converts to the warp's red and blue planes, but it is **off by default**:
|
||||
applied after demosaic it made the render's CA worse (Verification). Vignetting is read but not applied (below). The
|
||||
conversion is verified on the **ILCE-7RM6** and, for distortion, the **ILCE-6700** ([ILCE-6700](#ilce-6700)); the
|
||||
conversion is verified on the **ILCE-7RM6** and, for distortion, the **ILCE-6700** ([ILCE-6700](#ilce-6700)) and the **ZV-E10** ([ZV-E10](#zv-e10)); the
|
||||
ILCE-7RM4A has its own conversion, with other conventions
|
||||
([Two conventions](#two-conventions)), and other Sony bodies' tables give no correction until they are verified.
|
||||
|
||||
@@ -105,7 +105,7 @@ the photo (portrait files are covered) and is carried by DNG export, as RW2's is
|
||||
## Which bodies get it
|
||||
|
||||
Only bodies on one of two allowlists in `arw_lens_rm6.rs` get an opcode: `FULL_FRAME_CROP` (today `ILCE-7RM6`,
|
||||
9984 × 6656) and `APSC_BODIES` (today `ILCE-6700`, below). The unit and the knot spacing are verified per body; a body
|
||||
9984 × 6656) and `APSC_BODIES` (today `ILCE-6700` and `ZV-E10`, below, each with its distortion unit). The unit and the knot spacing are verified per body; a body
|
||||
with another sensor size or another unit would be warped wrongly. Other bodies get no correction from this conversion;
|
||||
the ILCE-7RM4A gets its own, with other conventions (below). To add a body: collect photos of it shot with distortion
|
||||
correction on (several lenses and focal lengths), repeat the camera-JPEG registration below against the uncorrected
|
||||
@@ -113,7 +113,7 @@ render, confirm the unit, the knot spacing and the zoom rule (or measure the bod
|
||||
default crop to `FULL_FRAME_CROP`, or an APS-C body whose knots span its own crop (as measured for the ILCE-6700) to
|
||||
`APSC_BODIES`, with a test; an APS-C body also needs its fit gate checked against the camera JPEG (see *ILCE-6700*).
|
||||
|
||||
For bodies in `APSC_BODIES` (today `ILCE-6700`), the knots span the file's own default crop: spacing = its half
|
||||
For bodies in `APSC_BODIES` (today `ILCE-6700` and `ZV-E10`), the knots span the file's own default crop: spacing = its half
|
||||
diagonal / (knot count − 1). This crop-based rule applies only to that list. The ILCE-7RM6 keeps its sensor-fixed
|
||||
400 px in both modes; in full frame (16 knots) the crop-based rule gives the same 400 px, and in its APS-C mode
|
||||
(11 knots) it would give 392 px, which was only an alternative measurement there (it fits as well, above).
|
||||
@@ -166,6 +166,29 @@ As rendered (`lightcraft-cli render`, Enable Lens Corrections on):
|
||||
At 11.7 mm and longer an exception of this kind fits worse than the body's rule (412 px / 14500 on the grid: 0.73–1.19 px against 0.48–0.69 px), so it stops at
|
||||
10.5 mm, the longest measured focal length where it helps; 10.6–11.6 mm is unmeasured and takes the body's rule.
|
||||
|
||||
## ZV-E10
|
||||
|
||||
The ZV-E10 (APS-C, 6000 × 4000 default crop at (12, 12) in 6048 × 4024 storage) writes 11-knot tables like the
|
||||
ILCE-6700, zero-padded to the same 17 values. Measured as above on 4 photos shot with distortion correction Auto (the
|
||||
E PZ 16-50 mm F3.5-5.6 OSS, which forces it; its owner's photos, only the summary numbers here): 2 at 16 mm, 1 at 29 mm
|
||||
(portrait) and 1 at 32 mm. Feature matches between the uncorrected render and the camera JPEG
|
||||
(LightCraft's `tools/sony_distortion_check.py`, SIFT agreement after the best similarity), the camera's map applied to the render's
|
||||
points in a scan of knot spacing 340–380 px and unit 15000–17800:
|
||||
|
||||
| | p95 residual at 1440 px |
|
||||
|---|---|
|
||||
| Uncorrected | 2.7–18.7 px (16 mm: 18.6–18.7 px) |
|
||||
| The ILCE-6700's rule (half diagonal / 10 = 360.56 px, unit 15000), as rendered | 0.45–2.18 px: the 16 mm photos over-corrected by about 9 % |
|
||||
| Sensor-fixed 400 px, unit 16384 | 0.43–3.21 px |
|
||||
| **Half diagonal / 10 = 360.56 px, unit 16384** (exact table) | **0.27–0.61 px** |
|
||||
| The same as LightCraft renders it (`lightcraft-cli render`, Enable Lens Corrections on, fitted polynomial) | **0.26–0.64 px** (median residual 0.07–0.36 px) |
|
||||
|
||||
At 360.56 px every unit from 16300 to 17000 lands within 0.60–0.64 px worst (the measurement's floor on these scenes);
|
||||
spacing and unit trade off along a ridge as on the ILCE-6700 (375 px / 15700 and 380 px / 15400 reach 0.59 px), so the
|
||||
body keeps the ILCE-6700's crop-based spacing and takes its own unit, 16384, in `APSC_BODIES`. The fitted polynomial
|
||||
passes the 0.5 px APS-C fit gate on all four tables, the strongest (16 mm, −1905 at the last knot) included. An HDR
|
||||
merge of a ZV-E10 bracket keeps the warp in the merged DNG's `OpcodeList3`, as for any raw with embedded corrections.
|
||||
|
||||
## Two conventions
|
||||
|
||||
A second Sony decoder, `src/arw_lens.rs`
|
||||
@@ -344,7 +367,7 @@ the resampled source by the source, framing and output size, so tone, colour and
|
||||
|
||||
## Limits
|
||||
|
||||
- **ILCE-7RM6 and ILCE-6700 only.** Other Sony bodies record the same tags; their knot spacing (defined here by the
|
||||
- **ILCE-7RM6, ILCE-6700 and ZV-E10 only.** Other Sony bodies record the same tags; their knot spacing (defined here by the
|
||||
full-frame crop, or an APS-C body's own crop), unit and zoom rule are unverified, so they get no correction from this conversion (the ILCE-7RM4A's distortion has
|
||||
its own: [Two conventions](#two-conventions)).
|
||||
- **ILCE-6700 at strong barrel distortion:** the body's rule leaves 1.36–1.38 px at the Sigma 10–18 mm's 10 mm end;
|
||||
@@ -355,6 +378,10 @@ the resampled source by the source, framing and output size, so tone, colour and
|
||||
6656 × 4608 frame, misses the 0.5 px fit gate, so that photo stays uncorrected (5.3 px). Other wide lenses with
|
||||
similarly strong tables are unmeasured. Its vignetting and lateral CA tables are read, not applied: measured in
|
||||
#2801 (the camera JPEG doesn't compensate vignetting, as on the ILCE-7RM6).
|
||||
- **ZV-E10: one lens, four photos.** Only the E PZ 16-50 mm (16–32 mm) is measured. Its unit, 16384, differs from
|
||||
the ILCE-6700's 15000; the ILCE-6700's own E 16–55 mm at 16 mm also fits a higher unit (16000, above), so the unit
|
||||
may belong to the lens rather than the body. Other lenses on the ZV-E10 are unmeasured and take 16384. The
|
||||
ZV-E10M2 (another sensor) is not covered.
|
||||
- **APS-C distortion is unverified in camera on the ILCE-7RM6:** no APS-C photo with distortion correction on was available; the APS-C
|
||||
knot spacing is verified on CA only, and the APS-C zoom follows the full-frame rule.
|
||||
- **Aspect-ratio crops** (in-camera 4:3, 16:9, 1:1) were not measured; the correction uses the crop the file records.
|
||||
|
||||
@@ -40,9 +40,10 @@
|
||||
//! The correction is produced whatever the in-camera flag says. Only bodies listed in [`FULL_FRAME_CROP`] or
|
||||
//! [`APSC_BODIES`] get it: the unit and the knot spacing are verified on the ILCE-7RM6 and, for distortion, on the
|
||||
//! ILCE-6700 (APS-C, 11 knots spanning its own crop, the same unit 15000: 0.73 px worst over 27 photos with three
|
||||
//! lenses as rendered, 1.38 px at the 10–18 mm's 10 mm end). Another body is added by repeating the measurement on its photos shot
|
||||
//! with distortion correction on and listing its full-frame default crop (or, for an APS-C body, its model). The method
|
||||
//! and the numbers: docs/sony-ilce7rm6-lens-corrections.md.
|
||||
//! lenses as rendered, 1.38 px at the 10–18 mm's 10 mm end) and the ZV-E10 (the same APS-C rule with unit 16384:
|
||||
//! 0.64 px worst over 4 photos with the E PZ 16–50 mm at 16–32 mm as rendered). Another body is added by repeating the
|
||||
//! measurement on its photos shot with distortion correction on and listing its full-frame default crop (or, for an
|
||||
//! APS-C body, its model). The method and the numbers: docs/sony-ilce7rm6-lens-corrections.md.
|
||||
|
||||
use crate::opcodes::max_radius;
|
||||
use crate::shared::fit_radial_warp;
|
||||
@@ -59,9 +60,15 @@ pub(crate) const CA_FLAG: u16 = 0x7034;
|
||||
|
||||
/// The bodies whose tables are verified (Exif `Model`), with their full-frame default crop (width, height) in px.
|
||||
const FULL_FRAME_CROP: &[(&str, (f64, f64))] = &[("ILCE-7RM6", (9984.0, 6656.0))];
|
||||
/// The verified APS-C bodies (Exif `Model`): their knots span the file's own default crop, the last knot at its corner.
|
||||
/// Measured on the ILCE-6700 (docs/sony-ilce7rm6-lens-corrections.md → ILCE-6700).
|
||||
const APSC_BODIES: &[&str] = &["ILCE-6700"];
|
||||
/// The verified APS-C bodies (Exif `Model`) with their distortion unit: their knots span the file's own default crop,
|
||||
/// the last knot at its corner. Measured against the camera JPEG (docs/sony-ilce7rm6-lens-corrections.md → ILCE-6700,
|
||||
/// ZV-E10): the ILCE-6700 at the ILCE-7RM6's 15000; the ZV-E10 at 16384, where 15000 over-corrects by about 9 %.
|
||||
const APSC_BODIES: &[(&str, f64)] = &[("ILCE-6700", DISTORTION_UNIT), ("ZV-E10", 16384.0)];
|
||||
|
||||
/// The distortion unit of an [`APSC_BODIES`] body.
|
||||
fn apsc_unit(model: &str) -> Option<f64> {
|
||||
APSC_BODIES.iter().find(|(m, _)| *m == model.trim()).map(|&(_, unit)| unit)
|
||||
}
|
||||
|
||||
/// A lens whose tables follow its body's convention with another knot spacing and unit, at the focal lengths up to
|
||||
/// `max_focal_mm`; measured like the body, against the camera JPEG.
|
||||
@@ -153,7 +160,7 @@ fn knot_spacing(model: &str, knots: usize, crop: Rect) -> Option<f64> {
|
||||
}
|
||||
let gaps = knots.checked_sub(1).filter(|&n| n > 0)?;
|
||||
let half_diagonal = (crop.width as f64).hypot(crop.height as f64) / 2.0;
|
||||
(APSC_BODIES.contains(&model) && crate::arw_lens::is_3_2(crop)).then(|| half_diagonal / gaps as f64)
|
||||
(apsc_unit(model).is_some() && crate::arw_lens::is_3_2(crop)).then(|| half_diagonal / gaps as f64)
|
||||
}
|
||||
|
||||
/// The knot table at radius `r` px: knot `i` at `i · spacing`, linear in between, the last segment extended beyond
|
||||
@@ -261,8 +268,8 @@ pub(crate) fn lens_opcodes(raw: &Ifd, model: &str, lens: Option<&str>, focal_mm:
|
||||
let Some(spacing) = knot_spacing(model, knots, crop) else { return Vec::new() };
|
||||
let op = if let Some(e) = lens_exception(model, lens, focal_mm) {
|
||||
gated_warp_opcode(&tables, e.knot_spacing, e.unit, active, crop, false, APSC_FIT_ERROR_PX_AT_1440)
|
||||
} else if APSC_BODIES.contains(&model.trim()) {
|
||||
gated_warp_opcode(&tables, spacing, DISTORTION_UNIT, active, crop, false, APSC_FIT_ERROR_PX_AT_1440)
|
||||
} else if let Some(unit) = apsc_unit(model) {
|
||||
gated_warp_opcode(&tables, spacing, unit, active, crop, false, APSC_FIT_ERROR_PX_AT_1440)
|
||||
} else {
|
||||
warp_opcode(&tables, spacing, active, crop, false)
|
||||
};
|
||||
@@ -310,6 +317,8 @@ mod tests {
|
||||
const FF_HQ_R: [f64; 4] = [0.9715153129, 0.02236266369, 0.0007060224765, 0.005666341563];
|
||||
const FF_HQ_B: [f64; 4] = [0.97137946, 0.02277016389, 0.0003830082563, 0.005727820598];
|
||||
const APSC_G: [f64; 4] = [1.01627551, -0.0618606692, 0.02768349621, -0.005595798468];
|
||||
/// The ZV-E10 16 mm example's G plane (unit 16384, knots over its crop's half diagonal / 10), from the same recipe.
|
||||
const ZV_E10_G: [f64; 4] = [1.051925248, -0.1972416727, 0.09393523723, -0.0282770833];
|
||||
const APSC_R: [f64; 4] = [1.016503991, -0.06206460153, 0.0278447625, -0.005644118171];
|
||||
const APSC_B: [f64; 4] = [1.016155702, -0.06162477627, 0.02753315326, -0.005554915901];
|
||||
|
||||
@@ -629,6 +638,33 @@ mod tests {
|
||||
assert!(matches!(ops.as_slice(), [Opcode::WarpRectilinear { planes, .. }] if planes.len() == 1), "{ops:?}");
|
||||
}
|
||||
|
||||
/// A ZV-E10 file (E PZ 16-50 mm at 16 mm): 11 knots, zero-padded as this body stores them.
|
||||
const ZV_E10_16MM_DISTORTION: [i16; 17] = [11, 72, -7, -129, -266, -446, -640, -877, -1114, -1380, -1639, -1905, 0, 0, 0, 0, 0];
|
||||
/// The ZV-E10's decoded geometry: 6048 × 4024 storage, a 6000 × 4000 default crop at (12, 12).
|
||||
const ZV_E10_ACTIVE: Rect = Rect { x: 0, y: 0, width: 6048, height: 4024 };
|
||||
const ZV_E10_CROP: Rect = Rect { x: 12, y: 12, width: 6000, height: 4000 };
|
||||
|
||||
/// The ZV-E10 follows the ILCE-6700's APS-C rule (knots over its own crop's half diagonal / 10, the APS-C fit
|
||||
/// gate) with its own unit, 16384; its zero padding is not read as knots, and its successor (ZV-E10M2) stays
|
||||
/// unverified.
|
||||
#[test]
|
||||
fn zv_e10_uses_the_apsc_rule_with_its_own_unit() {
|
||||
let s = knot_spacing("ZV-E10", 11, ZV_E10_CROP).unwrap();
|
||||
assert!((s - 360.5551).abs() < 1e-3, "{s}");
|
||||
let ifd = sony_lens_ifd(&ZV_E10_16MM_DISTORTION, &APSC_VIGNETTING, &APSC_CA, [17, 2, 1]);
|
||||
let t = read_tables(&ifd);
|
||||
assert_eq!(t.distortion.as_ref().map(Vec::len), Some(11));
|
||||
let gated = gated_warp_opcode(&t, s, 16384.0, ZV_E10_ACTIVE, ZV_E10_CROP, false, APSC_FIT_ERROR_PX_AT_1440);
|
||||
let ops = lens_opcodes(&ifd, " ZV-E10 ", Some("E PZ 16-50mm F3.5-5.6 OSS"), Some(16.0), ZV_E10_ACTIVE, ZV_E10_CROP);
|
||||
assert_warp(ops.first().cloned(), [3011.5 / 6047.0, 0.5], &[ZV_E10_G]);
|
||||
assert_eq!(ops, gated.into_iter().collect::<Vec<_>>());
|
||||
// the ILCE-6700's unit would warp it differently
|
||||
let at_15000 = gated_warp_opcode(&t, s, DISTORTION_UNIT, ZV_E10_ACTIVE, ZV_E10_CROP, false, APSC_FIT_ERROR_PX_AT_1440);
|
||||
assert_ne!(ops.first(), at_15000.as_ref());
|
||||
assert_eq!(apsc_unit("ILCE-6700"), Some(DISTORTION_UNIT));
|
||||
assert!(lens_opcodes(&ifd, "ZV-E10M2", None, None, ZV_E10_ACTIVE, ZV_E10_CROP).is_empty());
|
||||
}
|
||||
|
||||
const SIGMA_10_18: &str = "10-18mm F2.8 DC DN | Contemporary 023";
|
||||
|
||||
/// The Sigma 10-18 mm exception: its spacing and unit at 10-10.5 mm, the body's rule from 11.7 mm (and without a
|
||||
|
||||
Reference in new issue
Block a user