From 15645dbb1036b81c483fdcbd60e021031cb67f27 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 4 May 2026 12:58:34 +1000 Subject: [PATCH] std/handsum: apply cube root mapping to alpha --- lib/handsum/handsum.go | 28 +++++++++++++++ release/c/wuffs-unsupported-snapshot.c | 48 ++++++++++++++++++++++++++ std/handsum/decode_handsum.wuffs | 38 ++++++++++++++++++++ test/nia-checksums-of-data.txt | 4 +-- 4 files changed, 116 insertions(+), 2 deletions(-) diff --git a/lib/handsum/handsum.go b/lib/handsum/handsum.go index 33bf9e28..a478ba87 100644 --- a/lib/handsum/handsum.go +++ b/lib/handsum/handsum.go @@ -129,6 +129,10 @@ package handsum // round-trip losslessly (in the 0x8 bucket). Chroma is narrowed (after Inverse // DCT) on decode and so is widened (before Forward DCT) on encode. Luma, // wide-Chroma and Alpha then use the same DCT buckets. +// +// For Alpha values only, to encourage producing 0x00 (fully transparent) or +// 0xFF (fully opaque) values, we transform (on decode) the values towards the +// extreme ends via a cube root mapping. import ( "errors" @@ -538,6 +542,9 @@ func Decode(r io.Reader) (image.Image, error) { aaBlockU8 := lowleveljpeg.BlockU8{} bitOffset = decodeBlockQ3(aaBlockU8[:], 8, &buf, bitOffset, QualityBest.numberOfCoefficients()) aaQuadBlockU8.UpsampleFrom(&aaBlockU8) + for i, v := range aaQuadBlockU8 { + aaQuadBlockU8[i] = cubeRootLUT[v] + } } } @@ -1068,6 +1075,27 @@ var scaleAndBiasChromaDownLUT = [256]uint8{ 0xB4, 0xB4, 0xB5, 0xB5, 0xB6, 0xB6, 0xB7, 0xB7, 0xB8, 0xB8, 0xB9, 0xB9, 0xBA, 0xBA, 0xBB, 0xBB, } +// cubeRootLUT[x] is the cube root of x, when mapping the uint8 range [0x00, +// 0xFF] to float64 range [-128/128, +127/128]. +var cubeRootLUT = [256]uint8{ + 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05, 0x05, + 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x08, 0x08, 0x09, 0x09, 0x09, 0x0A, 0x0A, 0x0B, 0x0B, 0x0B, + 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x10, 0x10, 0x11, 0x11, 0x12, 0x12, + 0x13, 0x13, 0x13, 0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17, 0x18, 0x18, 0x19, 0x19, 0x1A, + 0x1A, 0x1B, 0x1B, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, + 0x24, 0x24, 0x25, 0x26, 0x26, 0x27, 0x28, 0x28, 0x29, 0x2A, 0x2B, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, + 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3F, + 0x40, 0x41, 0x43, 0x44, 0x46, 0x48, 0x49, 0x4B, 0x4D, 0x4F, 0x52, 0x55, 0x58, 0x5B, 0x60, 0x67, + 0x80, 0x99, 0xA0, 0xA5, 0xA8, 0xAB, 0xAE, 0xB1, 0xB3, 0xB5, 0xB7, 0xB8, 0xBA, 0xBC, 0xBD, 0xBF, + 0xC0, 0xC1, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, + 0xD1, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD5, 0xD6, 0xD7, 0xD8, 0xD8, 0xD9, 0xDA, 0xDA, 0xDB, 0xDC, + 0xDC, 0xDD, 0xDE, 0xDE, 0xDF, 0xDF, 0xE0, 0xE1, 0xE1, 0xE2, 0xE2, 0xE3, 0xE3, 0xE4, 0xE5, 0xE5, + 0xE6, 0xE6, 0xE7, 0xE7, 0xE8, 0xE8, 0xE9, 0xE9, 0xEA, 0xEA, 0xEB, 0xEB, 0xEC, 0xEC, 0xED, 0xED, + 0xED, 0xEE, 0xEE, 0xEF, 0xEF, 0xF0, 0xF0, 0xF1, 0xF1, 0xF1, 0xF2, 0xF2, 0xF3, 0xF3, 0xF3, 0xF4, + 0xF4, 0xF5, 0xF5, 0xF5, 0xF6, 0xF6, 0xF7, 0xF7, 0xF7, 0xF8, 0xF8, 0xF9, 0xF9, 0xF9, 0xFA, 0xFA, + 0xFA, 0xFB, 0xFB, 0xFC, 0xFC, 0xFC, 0xFD, 0xFD, 0xFD, 0xFE, 0xFE, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, +} + // biasAndClamp[x & 1023] is (x + 0x80), clamped to the range [0x00, 0xFF], for // a signed integer x in the range [-512, +511]. var biasAndClamp = [1024]uint8{ diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 95249b6d..954ee551 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -50393,6 +50393,42 @@ WUFFS_HANDSUM__SCALE_AND_BIAS_CHROMA_DOWN[256] WUFFS_BASE__POTENTIALLY_UNUSED = 184u, 184u, 185u, 185u, 186u, 186u, 187u, 187u, }; +static const uint8_t +WUFFS_HANDSUM__CUBE_ROOT[256] WUFFS_BASE__POTENTIALLY_UNUSED = { + 0u, 0u, 1u, 1u, 1u, 2u, 2u, 2u, + 3u, 3u, 3u, 4u, 4u, 4u, 5u, 5u, + 6u, 6u, 6u, 7u, 7u, 7u, 8u, 8u, + 9u, 9u, 9u, 10u, 10u, 11u, 11u, 11u, + 12u, 12u, 13u, 13u, 13u, 14u, 14u, 15u, + 15u, 15u, 16u, 16u, 17u, 17u, 18u, 18u, + 19u, 19u, 19u, 20u, 20u, 21u, 21u, 22u, + 22u, 23u, 23u, 24u, 24u, 25u, 25u, 26u, + 26u, 27u, 27u, 28u, 29u, 29u, 30u, 30u, + 31u, 31u, 32u, 33u, 33u, 34u, 34u, 35u, + 36u, 36u, 37u, 38u, 38u, 39u, 40u, 40u, + 41u, 42u, 43u, 43u, 44u, 45u, 46u, 47u, + 47u, 48u, 49u, 50u, 51u, 52u, 53u, 54u, + 55u, 56u, 57u, 58u, 59u, 60u, 61u, 63u, + 64u, 65u, 67u, 68u, 70u, 72u, 73u, 75u, + 77u, 79u, 82u, 85u, 88u, 91u, 96u, 103u, + 128u, 153u, 160u, 165u, 168u, 171u, 174u, 177u, + 179u, 181u, 183u, 184u, 186u, 188u, 189u, 191u, + 192u, 193u, 195u, 196u, 197u, 198u, 199u, 200u, + 201u, 202u, 203u, 204u, 205u, 206u, 207u, 208u, + 209u, 209u, 210u, 211u, 212u, 213u, 213u, 214u, + 215u, 216u, 216u, 217u, 218u, 218u, 219u, 220u, + 220u, 221u, 222u, 222u, 223u, 223u, 224u, 225u, + 225u, 226u, 226u, 227u, 227u, 228u, 229u, 229u, + 230u, 230u, 231u, 231u, 232u, 232u, 233u, 233u, + 234u, 234u, 235u, 235u, 236u, 236u, 237u, 237u, + 237u, 238u, 238u, 239u, 239u, 240u, 240u, 241u, + 241u, 241u, 242u, 242u, 243u, 243u, 243u, 244u, + 244u, 245u, 245u, 245u, 246u, 246u, 247u, 247u, + 247u, 248u, 248u, 249u, 249u, 249u, 250u, 250u, + 250u, 251u, 251u, 252u, 252u, 252u, 253u, 253u, + 253u, 254u, 254u, 254u, 255u, 255u, 255u, 255u, +}; + static const uint8_t WUFFS_HANDSUM__SMOOTHING_PAIRS_16X16[56] WUFFS_BASE__POTENTIALLY_UNUSED = { 7u, 8u, 23u, 24u, 39u, 40u, 55u, 56u, @@ -51915,6 +51951,18 @@ wuffs_handsum__decoder__upsample_chroma_and_alpha( } v_y += 1u; } + if (self->private_impl.f_color < 3u) { + return wuffs_base__make_empty_struct(); + } + v_y = 0u; + while (v_y < 16u) { + v_x = 0u; + while (v_x < 16u) { + self->private_data.f_buffers[0u][v_y][((4u * v_x) + 3u)] = WUFFS_HANDSUM__CUBE_ROOT[self->private_data.f_buffers[0u][v_y][((4u * v_x) + 3u)]]; + v_x += 1u; + } + v_y += 1u; + } return wuffs_base__make_empty_struct(); } diff --git a/std/handsum/decode_handsum.wuffs b/std/handsum/decode_handsum.wuffs index 8c5d3bc5..afa07c04 100644 --- a/std/handsum/decode_handsum.wuffs +++ b/std/handsum/decode_handsum.wuffs @@ -841,6 +841,24 @@ pri func decoder.upsample_chroma_and_alpha!() { } y += 1 } + + if this.color < 3 { + return nothing + } + + y = 0 + while y < 16 { + x = 0 + while x < 16, + inv y < 16, + { + this.buffers[0][y][(4 * x) + 3] = CUBE_ROOT[ + this.buffers[0][y][(4 * x) + 3]] + + x += 1 + } + y += 1 + } } pri func decoder.convert_yxxx_to_y!(which: base.u32[..= 1]) { @@ -1199,6 +1217,26 @@ pri const SCALE_AND_BIAS_CHROMA_DOWN : roarray[256] base.u8 = [ 0xB4, 0xB4, 0xB5, 0xB5, 0xB6, 0xB6, 0xB7, 0xB7, 0xB8, 0xB8, 0xB9, 0xB9, 0xBA, 0xBA, 0xBB, 0xBB, ] +pri const CUBE_ROOT : roarray[256] base.u8 = [ + 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05, 0x05, + 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x08, 0x08, 0x09, 0x09, 0x09, 0x0A, 0x0A, 0x0B, 0x0B, 0x0B, + 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x10, 0x10, 0x11, 0x11, 0x12, 0x12, + 0x13, 0x13, 0x13, 0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17, 0x18, 0x18, 0x19, 0x19, 0x1A, + 0x1A, 0x1B, 0x1B, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, + 0x24, 0x24, 0x25, 0x26, 0x26, 0x27, 0x28, 0x28, 0x29, 0x2A, 0x2B, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, + 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3F, + 0x40, 0x41, 0x43, 0x44, 0x46, 0x48, 0x49, 0x4B, 0x4D, 0x4F, 0x52, 0x55, 0x58, 0x5B, 0x60, 0x67, + + 0x80, 0x99, 0xA0, 0xA5, 0xA8, 0xAB, 0xAE, 0xB1, 0xB3, 0xB5, 0xB7, 0xB8, 0xBA, 0xBC, 0xBD, 0xBF, + 0xC0, 0xC1, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, + 0xD1, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD5, 0xD6, 0xD7, 0xD8, 0xD8, 0xD9, 0xDA, 0xDA, 0xDB, 0xDC, + 0xDC, 0xDD, 0xDE, 0xDE, 0xDF, 0xDF, 0xE0, 0xE1, 0xE1, 0xE2, 0xE2, 0xE3, 0xE3, 0xE4, 0xE5, 0xE5, + 0xE6, 0xE6, 0xE7, 0xE7, 0xE8, 0xE8, 0xE9, 0xE9, 0xEA, 0xEA, 0xEB, 0xEB, 0xEC, 0xEC, 0xED, 0xED, + 0xED, 0xEE, 0xEE, 0xEF, 0xEF, 0xF0, 0xF0, 0xF1, 0xF1, 0xF1, 0xF2, 0xF2, 0xF3, 0xF3, 0xF3, 0xF4, + 0xF4, 0xF5, 0xF5, 0xF5, 0xF6, 0xF6, 0xF7, 0xF7, 0xF7, 0xF8, 0xF8, 0xF9, 0xF9, 0xF9, 0xFA, 0xFA, + 0xFA, 0xFB, 0xFB, 0xFC, 0xFC, 0xFC, 0xFD, 0xFD, 0xFD, 0xFE, 0xFE, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, +] + pri const SMOOTHING_PAIRS_16X16 : roarray[56] base.u8 = [ 0x07, 0x08, 0x17, 0x18, diff --git a/test/nia-checksums-of-data.txt b/test/nia-checksums-of-data.txt index b967108f..3685ecec 100644 --- a/test/nia-checksums-of-data.txt +++ b/test/nia-checksums-of-data.txt @@ -6,8 +6,8 @@ OK. e3bae566 test/data/49.bp4.nie OK. c3528d19 test/data/49.bp8.nie OK. bf3fd567 test/data/49.c3q1.handsum OK. 7cac72e5 test/data/49.c3q3.handsum -OK. 44e9cb76 test/data/49.c4q1.handsum -OK. d55478dd test/data/49.c4q3.handsum +OK. b8e18bd1 test/data/49.c4q1.handsum +OK. 295c387a test/data/49.c4q3.handsum OK. f2a0a3f6 test/data/49.png OK. d3bb0beb test/data/DCI-P3-D65.icc OK. 646e081a test/data/animated-red-blue.000000.nie