diff --git a/lib/lowleveljpeg/block.go b/lib/lowleveljpeg/block.go index 51aebb2b..4fdc2594 100644 --- a/lib/lowleveljpeg/block.go +++ b/lib/lowleveljpeg/block.go @@ -20,7 +20,8 @@ func ifElse(condition bool, whenTrue int64, whenFalse int64) int64 { const ( fmtHex = "0123456789ABCDEF" - fmtSep = " \n" // 7 spaces and then a new line. + fmtSep = " \n" // 7 spaces and then a new line. + fmtS16 = " \n" // 15 spaces and then a new line. ) const ( @@ -223,6 +224,23 @@ func (b *BlockI16) IsValid() bool { return true } +// QuadBlockU8 is like a BlockU8 but it is 16×16 instead of 8×8. +// +// It is indexed in XY (not DCT) space. If b is a QuadBlockU8 then b[0] is the +// top-left corner and b[16] is one pixel below that. +type QuadBlockU8 [256]uint8 + +// String returns b in human-readable form. +func (b QuadBlockU8) String() string { + buf := [256 * 3]byte{} + for i, value := range b { + buf[(3*i)+0] = fmtHex[15&(value>>0x04)] + buf[(3*i)+1] = fmtHex[15&(value>>0x00)] + buf[(3*i)+2] = fmtS16[15&i] + } + return string(buf[:]) +} + // These are "1 / 2" and "1 / (2 * √2)" as 16.16 fixed point values. const ( fixedPointHalf = +0x8000 diff --git a/lib/lowleveljpeg/data.go b/lib/lowleveljpeg/data.go index 2d9f3ac2..27395c6b 100644 --- a/lib/lowleveljpeg/data.go +++ b/lib/lowleveljpeg/data.go @@ -12,6 +12,271 @@ package lowleveljpeg +// UpsampleFrom produces one 16×16 quad-block from one 8×8 block. +// +// It uses a triangle filter. +func (dst *QuadBlockU8) UpsampleFrom(src *BlockU8) { + if (dst == nil) || (src == nil) { + return + } + dst[0x00] = src[0x00] + dst[0x01] = uint8(((3 * uint32(src[0x00])) + uint32(src[0x01]) + 2) / 4) + dst[0x02] = uint8(((3 * uint32(src[0x01])) + uint32(src[0x00]) + 2) / 4) + dst[0x03] = uint8(((3 * uint32(src[0x01])) + uint32(src[0x02]) + 2) / 4) + dst[0x04] = uint8(((3 * uint32(src[0x02])) + uint32(src[0x01]) + 2) / 4) + dst[0x05] = uint8(((3 * uint32(src[0x02])) + uint32(src[0x03]) + 2) / 4) + dst[0x06] = uint8(((3 * uint32(src[0x03])) + uint32(src[0x02]) + 2) / 4) + dst[0x07] = uint8(((3 * uint32(src[0x03])) + uint32(src[0x04]) + 2) / 4) + dst[0x08] = uint8(((3 * uint32(src[0x04])) + uint32(src[0x03]) + 2) / 4) + dst[0x09] = uint8(((3 * uint32(src[0x04])) + uint32(src[0x05]) + 2) / 4) + dst[0x0A] = uint8(((3 * uint32(src[0x05])) + uint32(src[0x04]) + 2) / 4) + dst[0x0B] = uint8(((3 * uint32(src[0x05])) + uint32(src[0x06]) + 2) / 4) + dst[0x0C] = uint8(((3 * uint32(src[0x06])) + uint32(src[0x05]) + 2) / 4) + dst[0x0D] = uint8(((3 * uint32(src[0x06])) + uint32(src[0x07]) + 2) / 4) + dst[0x0E] = uint8(((3 * uint32(src[0x07])) + uint32(src[0x06]) + 2) / 4) + dst[0x0F] = src[0x07] + dst[0x10] = uint8(((3 * uint32(src[0x00])) + uint32(src[0x08]) + 2) / 4) + dst[0x11] = uint8(((9 * uint32(src[0x00])) + (3 * uint32(src[0x01])) + (3 * uint32(src[0x08])) + uint32(src[0x09]) + 8) / 16) + dst[0x12] = uint8(((9 * uint32(src[0x01])) + (3 * uint32(src[0x00])) + (3 * uint32(src[0x09])) + uint32(src[0x08]) + 8) / 16) + dst[0x13] = uint8(((9 * uint32(src[0x01])) + (3 * uint32(src[0x02])) + (3 * uint32(src[0x09])) + uint32(src[0x0A]) + 8) / 16) + dst[0x14] = uint8(((9 * uint32(src[0x02])) + (3 * uint32(src[0x01])) + (3 * uint32(src[0x0A])) + uint32(src[0x09]) + 8) / 16) + dst[0x15] = uint8(((9 * uint32(src[0x02])) + (3 * uint32(src[0x03])) + (3 * uint32(src[0x0A])) + uint32(src[0x0B]) + 8) / 16) + dst[0x16] = uint8(((9 * uint32(src[0x03])) + (3 * uint32(src[0x02])) + (3 * uint32(src[0x0B])) + uint32(src[0x0A]) + 8) / 16) + dst[0x17] = uint8(((9 * uint32(src[0x03])) + (3 * uint32(src[0x04])) + (3 * uint32(src[0x0B])) + uint32(src[0x0C]) + 8) / 16) + dst[0x18] = uint8(((9 * uint32(src[0x04])) + (3 * uint32(src[0x03])) + (3 * uint32(src[0x0C])) + uint32(src[0x0B]) + 8) / 16) + dst[0x19] = uint8(((9 * uint32(src[0x04])) + (3 * uint32(src[0x05])) + (3 * uint32(src[0x0C])) + uint32(src[0x0D]) + 8) / 16) + dst[0x1A] = uint8(((9 * uint32(src[0x05])) + (3 * uint32(src[0x04])) + (3 * uint32(src[0x0D])) + uint32(src[0x0C]) + 8) / 16) + dst[0x1B] = uint8(((9 * uint32(src[0x05])) + (3 * uint32(src[0x06])) + (3 * uint32(src[0x0D])) + uint32(src[0x0E]) + 8) / 16) + dst[0x1C] = uint8(((9 * uint32(src[0x06])) + (3 * uint32(src[0x05])) + (3 * uint32(src[0x0E])) + uint32(src[0x0D]) + 8) / 16) + dst[0x1D] = uint8(((9 * uint32(src[0x06])) + (3 * uint32(src[0x07])) + (3 * uint32(src[0x0E])) + uint32(src[0x0F]) + 8) / 16) + dst[0x1E] = uint8(((9 * uint32(src[0x07])) + (3 * uint32(src[0x06])) + (3 * uint32(src[0x0F])) + uint32(src[0x0E]) + 8) / 16) + dst[0x1F] = uint8(((3 * uint32(src[0x07])) + uint32(src[0x0F]) + 2) / 4) + dst[0x20] = uint8(((3 * uint32(src[0x08])) + uint32(src[0x00]) + 2) / 4) + dst[0x21] = uint8(((9 * uint32(src[0x08])) + (3 * uint32(src[0x09])) + (3 * uint32(src[0x00])) + uint32(src[0x01]) + 8) / 16) + dst[0x22] = uint8(((9 * uint32(src[0x09])) + (3 * uint32(src[0x08])) + (3 * uint32(src[0x01])) + uint32(src[0x00]) + 8) / 16) + dst[0x23] = uint8(((9 * uint32(src[0x09])) + (3 * uint32(src[0x0A])) + (3 * uint32(src[0x01])) + uint32(src[0x02]) + 8) / 16) + dst[0x24] = uint8(((9 * uint32(src[0x0A])) + (3 * uint32(src[0x09])) + (3 * uint32(src[0x02])) + uint32(src[0x01]) + 8) / 16) + dst[0x25] = uint8(((9 * uint32(src[0x0A])) + (3 * uint32(src[0x0B])) + (3 * uint32(src[0x02])) + uint32(src[0x03]) + 8) / 16) + dst[0x26] = uint8(((9 * uint32(src[0x0B])) + (3 * uint32(src[0x0A])) + (3 * uint32(src[0x03])) + uint32(src[0x02]) + 8) / 16) + dst[0x27] = uint8(((9 * uint32(src[0x0B])) + (3 * uint32(src[0x0C])) + (3 * uint32(src[0x03])) + uint32(src[0x04]) + 8) / 16) + dst[0x28] = uint8(((9 * uint32(src[0x0C])) + (3 * uint32(src[0x0B])) + (3 * uint32(src[0x04])) + uint32(src[0x03]) + 8) / 16) + dst[0x29] = uint8(((9 * uint32(src[0x0C])) + (3 * uint32(src[0x0D])) + (3 * uint32(src[0x04])) + uint32(src[0x05]) + 8) / 16) + dst[0x2A] = uint8(((9 * uint32(src[0x0D])) + (3 * uint32(src[0x0C])) + (3 * uint32(src[0x05])) + uint32(src[0x04]) + 8) / 16) + dst[0x2B] = uint8(((9 * uint32(src[0x0D])) + (3 * uint32(src[0x0E])) + (3 * uint32(src[0x05])) + uint32(src[0x06]) + 8) / 16) + dst[0x2C] = uint8(((9 * uint32(src[0x0E])) + (3 * uint32(src[0x0D])) + (3 * uint32(src[0x06])) + uint32(src[0x05]) + 8) / 16) + dst[0x2D] = uint8(((9 * uint32(src[0x0E])) + (3 * uint32(src[0x0F])) + (3 * uint32(src[0x06])) + uint32(src[0x07]) + 8) / 16) + dst[0x2E] = uint8(((9 * uint32(src[0x0F])) + (3 * uint32(src[0x0E])) + (3 * uint32(src[0x07])) + uint32(src[0x06]) + 8) / 16) + dst[0x2F] = uint8(((3 * uint32(src[0x0F])) + uint32(src[0x07]) + 2) / 4) + dst[0x30] = uint8(((3 * uint32(src[0x08])) + uint32(src[0x10]) + 2) / 4) + dst[0x31] = uint8(((9 * uint32(src[0x08])) + (3 * uint32(src[0x09])) + (3 * uint32(src[0x10])) + uint32(src[0x11]) + 8) / 16) + dst[0x32] = uint8(((9 * uint32(src[0x09])) + (3 * uint32(src[0x08])) + (3 * uint32(src[0x11])) + uint32(src[0x10]) + 8) / 16) + dst[0x33] = uint8(((9 * uint32(src[0x09])) + (3 * uint32(src[0x0A])) + (3 * uint32(src[0x11])) + uint32(src[0x12]) + 8) / 16) + dst[0x34] = uint8(((9 * uint32(src[0x0A])) + (3 * uint32(src[0x09])) + (3 * uint32(src[0x12])) + uint32(src[0x11]) + 8) / 16) + dst[0x35] = uint8(((9 * uint32(src[0x0A])) + (3 * uint32(src[0x0B])) + (3 * uint32(src[0x12])) + uint32(src[0x13]) + 8) / 16) + dst[0x36] = uint8(((9 * uint32(src[0x0B])) + (3 * uint32(src[0x0A])) + (3 * uint32(src[0x13])) + uint32(src[0x12]) + 8) / 16) + dst[0x37] = uint8(((9 * uint32(src[0x0B])) + (3 * uint32(src[0x0C])) + (3 * uint32(src[0x13])) + uint32(src[0x14]) + 8) / 16) + dst[0x38] = uint8(((9 * uint32(src[0x0C])) + (3 * uint32(src[0x0B])) + (3 * uint32(src[0x14])) + uint32(src[0x13]) + 8) / 16) + dst[0x39] = uint8(((9 * uint32(src[0x0C])) + (3 * uint32(src[0x0D])) + (3 * uint32(src[0x14])) + uint32(src[0x15]) + 8) / 16) + dst[0x3A] = uint8(((9 * uint32(src[0x0D])) + (3 * uint32(src[0x0C])) + (3 * uint32(src[0x15])) + uint32(src[0x14]) + 8) / 16) + dst[0x3B] = uint8(((9 * uint32(src[0x0D])) + (3 * uint32(src[0x0E])) + (3 * uint32(src[0x15])) + uint32(src[0x16]) + 8) / 16) + dst[0x3C] = uint8(((9 * uint32(src[0x0E])) + (3 * uint32(src[0x0D])) + (3 * uint32(src[0x16])) + uint32(src[0x15]) + 8) / 16) + dst[0x3D] = uint8(((9 * uint32(src[0x0E])) + (3 * uint32(src[0x0F])) + (3 * uint32(src[0x16])) + uint32(src[0x17]) + 8) / 16) + dst[0x3E] = uint8(((9 * uint32(src[0x0F])) + (3 * uint32(src[0x0E])) + (3 * uint32(src[0x17])) + uint32(src[0x16]) + 8) / 16) + dst[0x3F] = uint8(((3 * uint32(src[0x0F])) + uint32(src[0x17]) + 2) / 4) + dst[0x40] = uint8(((3 * uint32(src[0x10])) + uint32(src[0x08]) + 2) / 4) + dst[0x41] = uint8(((9 * uint32(src[0x10])) + (3 * uint32(src[0x11])) + (3 * uint32(src[0x08])) + uint32(src[0x09]) + 8) / 16) + dst[0x42] = uint8(((9 * uint32(src[0x11])) + (3 * uint32(src[0x10])) + (3 * uint32(src[0x09])) + uint32(src[0x08]) + 8) / 16) + dst[0x43] = uint8(((9 * uint32(src[0x11])) + (3 * uint32(src[0x12])) + (3 * uint32(src[0x09])) + uint32(src[0x0A]) + 8) / 16) + dst[0x44] = uint8(((9 * uint32(src[0x12])) + (3 * uint32(src[0x11])) + (3 * uint32(src[0x0A])) + uint32(src[0x09]) + 8) / 16) + dst[0x45] = uint8(((9 * uint32(src[0x12])) + (3 * uint32(src[0x13])) + (3 * uint32(src[0x0A])) + uint32(src[0x0B]) + 8) / 16) + dst[0x46] = uint8(((9 * uint32(src[0x13])) + (3 * uint32(src[0x12])) + (3 * uint32(src[0x0B])) + uint32(src[0x0A]) + 8) / 16) + dst[0x47] = uint8(((9 * uint32(src[0x13])) + (3 * uint32(src[0x14])) + (3 * uint32(src[0x0B])) + uint32(src[0x0C]) + 8) / 16) + dst[0x48] = uint8(((9 * uint32(src[0x14])) + (3 * uint32(src[0x13])) + (3 * uint32(src[0x0C])) + uint32(src[0x0B]) + 8) / 16) + dst[0x49] = uint8(((9 * uint32(src[0x14])) + (3 * uint32(src[0x15])) + (3 * uint32(src[0x0C])) + uint32(src[0x0D]) + 8) / 16) + dst[0x4A] = uint8(((9 * uint32(src[0x15])) + (3 * uint32(src[0x14])) + (3 * uint32(src[0x0D])) + uint32(src[0x0C]) + 8) / 16) + dst[0x4B] = uint8(((9 * uint32(src[0x15])) + (3 * uint32(src[0x16])) + (3 * uint32(src[0x0D])) + uint32(src[0x0E]) + 8) / 16) + dst[0x4C] = uint8(((9 * uint32(src[0x16])) + (3 * uint32(src[0x15])) + (3 * uint32(src[0x0E])) + uint32(src[0x0D]) + 8) / 16) + dst[0x4D] = uint8(((9 * uint32(src[0x16])) + (3 * uint32(src[0x17])) + (3 * uint32(src[0x0E])) + uint32(src[0x0F]) + 8) / 16) + dst[0x4E] = uint8(((9 * uint32(src[0x17])) + (3 * uint32(src[0x16])) + (3 * uint32(src[0x0F])) + uint32(src[0x0E]) + 8) / 16) + dst[0x4F] = uint8(((3 * uint32(src[0x17])) + uint32(src[0x0F]) + 2) / 4) + dst[0x50] = uint8(((3 * uint32(src[0x10])) + uint32(src[0x18]) + 2) / 4) + dst[0x51] = uint8(((9 * uint32(src[0x10])) + (3 * uint32(src[0x11])) + (3 * uint32(src[0x18])) + uint32(src[0x19]) + 8) / 16) + dst[0x52] = uint8(((9 * uint32(src[0x11])) + (3 * uint32(src[0x10])) + (3 * uint32(src[0x19])) + uint32(src[0x18]) + 8) / 16) + dst[0x53] = uint8(((9 * uint32(src[0x11])) + (3 * uint32(src[0x12])) + (3 * uint32(src[0x19])) + uint32(src[0x1A]) + 8) / 16) + dst[0x54] = uint8(((9 * uint32(src[0x12])) + (3 * uint32(src[0x11])) + (3 * uint32(src[0x1A])) + uint32(src[0x19]) + 8) / 16) + dst[0x55] = uint8(((9 * uint32(src[0x12])) + (3 * uint32(src[0x13])) + (3 * uint32(src[0x1A])) + uint32(src[0x1B]) + 8) / 16) + dst[0x56] = uint8(((9 * uint32(src[0x13])) + (3 * uint32(src[0x12])) + (3 * uint32(src[0x1B])) + uint32(src[0x1A]) + 8) / 16) + dst[0x57] = uint8(((9 * uint32(src[0x13])) + (3 * uint32(src[0x14])) + (3 * uint32(src[0x1B])) + uint32(src[0x1C]) + 8) / 16) + dst[0x58] = uint8(((9 * uint32(src[0x14])) + (3 * uint32(src[0x13])) + (3 * uint32(src[0x1C])) + uint32(src[0x1B]) + 8) / 16) + dst[0x59] = uint8(((9 * uint32(src[0x14])) + (3 * uint32(src[0x15])) + (3 * uint32(src[0x1C])) + uint32(src[0x1D]) + 8) / 16) + dst[0x5A] = uint8(((9 * uint32(src[0x15])) + (3 * uint32(src[0x14])) + (3 * uint32(src[0x1D])) + uint32(src[0x1C]) + 8) / 16) + dst[0x5B] = uint8(((9 * uint32(src[0x15])) + (3 * uint32(src[0x16])) + (3 * uint32(src[0x1D])) + uint32(src[0x1E]) + 8) / 16) + dst[0x5C] = uint8(((9 * uint32(src[0x16])) + (3 * uint32(src[0x15])) + (3 * uint32(src[0x1E])) + uint32(src[0x1D]) + 8) / 16) + dst[0x5D] = uint8(((9 * uint32(src[0x16])) + (3 * uint32(src[0x17])) + (3 * uint32(src[0x1E])) + uint32(src[0x1F]) + 8) / 16) + dst[0x5E] = uint8(((9 * uint32(src[0x17])) + (3 * uint32(src[0x16])) + (3 * uint32(src[0x1F])) + uint32(src[0x1E]) + 8) / 16) + dst[0x5F] = uint8(((3 * uint32(src[0x17])) + uint32(src[0x1F]) + 2) / 4) + dst[0x60] = uint8(((3 * uint32(src[0x18])) + uint32(src[0x10]) + 2) / 4) + dst[0x61] = uint8(((9 * uint32(src[0x18])) + (3 * uint32(src[0x19])) + (3 * uint32(src[0x10])) + uint32(src[0x11]) + 8) / 16) + dst[0x62] = uint8(((9 * uint32(src[0x19])) + (3 * uint32(src[0x18])) + (3 * uint32(src[0x11])) + uint32(src[0x10]) + 8) / 16) + dst[0x63] = uint8(((9 * uint32(src[0x19])) + (3 * uint32(src[0x1A])) + (3 * uint32(src[0x11])) + uint32(src[0x12]) + 8) / 16) + dst[0x64] = uint8(((9 * uint32(src[0x1A])) + (3 * uint32(src[0x19])) + (3 * uint32(src[0x12])) + uint32(src[0x11]) + 8) / 16) + dst[0x65] = uint8(((9 * uint32(src[0x1A])) + (3 * uint32(src[0x1B])) + (3 * uint32(src[0x12])) + uint32(src[0x13]) + 8) / 16) + dst[0x66] = uint8(((9 * uint32(src[0x1B])) + (3 * uint32(src[0x1A])) + (3 * uint32(src[0x13])) + uint32(src[0x12]) + 8) / 16) + dst[0x67] = uint8(((9 * uint32(src[0x1B])) + (3 * uint32(src[0x1C])) + (3 * uint32(src[0x13])) + uint32(src[0x14]) + 8) / 16) + dst[0x68] = uint8(((9 * uint32(src[0x1C])) + (3 * uint32(src[0x1B])) + (3 * uint32(src[0x14])) + uint32(src[0x13]) + 8) / 16) + dst[0x69] = uint8(((9 * uint32(src[0x1C])) + (3 * uint32(src[0x1D])) + (3 * uint32(src[0x14])) + uint32(src[0x15]) + 8) / 16) + dst[0x6A] = uint8(((9 * uint32(src[0x1D])) + (3 * uint32(src[0x1C])) + (3 * uint32(src[0x15])) + uint32(src[0x14]) + 8) / 16) + dst[0x6B] = uint8(((9 * uint32(src[0x1D])) + (3 * uint32(src[0x1E])) + (3 * uint32(src[0x15])) + uint32(src[0x16]) + 8) / 16) + dst[0x6C] = uint8(((9 * uint32(src[0x1E])) + (3 * uint32(src[0x1D])) + (3 * uint32(src[0x16])) + uint32(src[0x15]) + 8) / 16) + dst[0x6D] = uint8(((9 * uint32(src[0x1E])) + (3 * uint32(src[0x1F])) + (3 * uint32(src[0x16])) + uint32(src[0x17]) + 8) / 16) + dst[0x6E] = uint8(((9 * uint32(src[0x1F])) + (3 * uint32(src[0x1E])) + (3 * uint32(src[0x17])) + uint32(src[0x16]) + 8) / 16) + dst[0x6F] = uint8(((3 * uint32(src[0x1F])) + uint32(src[0x17]) + 2) / 4) + dst[0x70] = uint8(((3 * uint32(src[0x18])) + uint32(src[0x20]) + 2) / 4) + dst[0x71] = uint8(((9 * uint32(src[0x18])) + (3 * uint32(src[0x19])) + (3 * uint32(src[0x20])) + uint32(src[0x21]) + 8) / 16) + dst[0x72] = uint8(((9 * uint32(src[0x19])) + (3 * uint32(src[0x18])) + (3 * uint32(src[0x21])) + uint32(src[0x20]) + 8) / 16) + dst[0x73] = uint8(((9 * uint32(src[0x19])) + (3 * uint32(src[0x1A])) + (3 * uint32(src[0x21])) + uint32(src[0x22]) + 8) / 16) + dst[0x74] = uint8(((9 * uint32(src[0x1A])) + (3 * uint32(src[0x19])) + (3 * uint32(src[0x22])) + uint32(src[0x21]) + 8) / 16) + dst[0x75] = uint8(((9 * uint32(src[0x1A])) + (3 * uint32(src[0x1B])) + (3 * uint32(src[0x22])) + uint32(src[0x23]) + 8) / 16) + dst[0x76] = uint8(((9 * uint32(src[0x1B])) + (3 * uint32(src[0x1A])) + (3 * uint32(src[0x23])) + uint32(src[0x22]) + 8) / 16) + dst[0x77] = uint8(((9 * uint32(src[0x1B])) + (3 * uint32(src[0x1C])) + (3 * uint32(src[0x23])) + uint32(src[0x24]) + 8) / 16) + dst[0x78] = uint8(((9 * uint32(src[0x1C])) + (3 * uint32(src[0x1B])) + (3 * uint32(src[0x24])) + uint32(src[0x23]) + 8) / 16) + dst[0x79] = uint8(((9 * uint32(src[0x1C])) + (3 * uint32(src[0x1D])) + (3 * uint32(src[0x24])) + uint32(src[0x25]) + 8) / 16) + dst[0x7A] = uint8(((9 * uint32(src[0x1D])) + (3 * uint32(src[0x1C])) + (3 * uint32(src[0x25])) + uint32(src[0x24]) + 8) / 16) + dst[0x7B] = uint8(((9 * uint32(src[0x1D])) + (3 * uint32(src[0x1E])) + (3 * uint32(src[0x25])) + uint32(src[0x26]) + 8) / 16) + dst[0x7C] = uint8(((9 * uint32(src[0x1E])) + (3 * uint32(src[0x1D])) + (3 * uint32(src[0x26])) + uint32(src[0x25]) + 8) / 16) + dst[0x7D] = uint8(((9 * uint32(src[0x1E])) + (3 * uint32(src[0x1F])) + (3 * uint32(src[0x26])) + uint32(src[0x27]) + 8) / 16) + dst[0x7E] = uint8(((9 * uint32(src[0x1F])) + (3 * uint32(src[0x1E])) + (3 * uint32(src[0x27])) + uint32(src[0x26]) + 8) / 16) + dst[0x7F] = uint8(((3 * uint32(src[0x1F])) + uint32(src[0x27]) + 2) / 4) + dst[0x80] = uint8(((3 * uint32(src[0x20])) + uint32(src[0x18]) + 2) / 4) + dst[0x81] = uint8(((9 * uint32(src[0x20])) + (3 * uint32(src[0x21])) + (3 * uint32(src[0x18])) + uint32(src[0x19]) + 8) / 16) + dst[0x82] = uint8(((9 * uint32(src[0x21])) + (3 * uint32(src[0x20])) + (3 * uint32(src[0x19])) + uint32(src[0x18]) + 8) / 16) + dst[0x83] = uint8(((9 * uint32(src[0x21])) + (3 * uint32(src[0x22])) + (3 * uint32(src[0x19])) + uint32(src[0x1A]) + 8) / 16) + dst[0x84] = uint8(((9 * uint32(src[0x22])) + (3 * uint32(src[0x21])) + (3 * uint32(src[0x1A])) + uint32(src[0x19]) + 8) / 16) + dst[0x85] = uint8(((9 * uint32(src[0x22])) + (3 * uint32(src[0x23])) + (3 * uint32(src[0x1A])) + uint32(src[0x1B]) + 8) / 16) + dst[0x86] = uint8(((9 * uint32(src[0x23])) + (3 * uint32(src[0x22])) + (3 * uint32(src[0x1B])) + uint32(src[0x1A]) + 8) / 16) + dst[0x87] = uint8(((9 * uint32(src[0x23])) + (3 * uint32(src[0x24])) + (3 * uint32(src[0x1B])) + uint32(src[0x1C]) + 8) / 16) + dst[0x88] = uint8(((9 * uint32(src[0x24])) + (3 * uint32(src[0x23])) + (3 * uint32(src[0x1C])) + uint32(src[0x1B]) + 8) / 16) + dst[0x89] = uint8(((9 * uint32(src[0x24])) + (3 * uint32(src[0x25])) + (3 * uint32(src[0x1C])) + uint32(src[0x1D]) + 8) / 16) + dst[0x8A] = uint8(((9 * uint32(src[0x25])) + (3 * uint32(src[0x24])) + (3 * uint32(src[0x1D])) + uint32(src[0x1C]) + 8) / 16) + dst[0x8B] = uint8(((9 * uint32(src[0x25])) + (3 * uint32(src[0x26])) + (3 * uint32(src[0x1D])) + uint32(src[0x1E]) + 8) / 16) + dst[0x8C] = uint8(((9 * uint32(src[0x26])) + (3 * uint32(src[0x25])) + (3 * uint32(src[0x1E])) + uint32(src[0x1D]) + 8) / 16) + dst[0x8D] = uint8(((9 * uint32(src[0x26])) + (3 * uint32(src[0x27])) + (3 * uint32(src[0x1E])) + uint32(src[0x1F]) + 8) / 16) + dst[0x8E] = uint8(((9 * uint32(src[0x27])) + (3 * uint32(src[0x26])) + (3 * uint32(src[0x1F])) + uint32(src[0x1E]) + 8) / 16) + dst[0x8F] = uint8(((3 * uint32(src[0x27])) + uint32(src[0x1F]) + 2) / 4) + dst[0x90] = uint8(((3 * uint32(src[0x20])) + uint32(src[0x28]) + 2) / 4) + dst[0x91] = uint8(((9 * uint32(src[0x20])) + (3 * uint32(src[0x21])) + (3 * uint32(src[0x28])) + uint32(src[0x29]) + 8) / 16) + dst[0x92] = uint8(((9 * uint32(src[0x21])) + (3 * uint32(src[0x20])) + (3 * uint32(src[0x29])) + uint32(src[0x28]) + 8) / 16) + dst[0x93] = uint8(((9 * uint32(src[0x21])) + (3 * uint32(src[0x22])) + (3 * uint32(src[0x29])) + uint32(src[0x2A]) + 8) / 16) + dst[0x94] = uint8(((9 * uint32(src[0x22])) + (3 * uint32(src[0x21])) + (3 * uint32(src[0x2A])) + uint32(src[0x29]) + 8) / 16) + dst[0x95] = uint8(((9 * uint32(src[0x22])) + (3 * uint32(src[0x23])) + (3 * uint32(src[0x2A])) + uint32(src[0x2B]) + 8) / 16) + dst[0x96] = uint8(((9 * uint32(src[0x23])) + (3 * uint32(src[0x22])) + (3 * uint32(src[0x2B])) + uint32(src[0x2A]) + 8) / 16) + dst[0x97] = uint8(((9 * uint32(src[0x23])) + (3 * uint32(src[0x24])) + (3 * uint32(src[0x2B])) + uint32(src[0x2C]) + 8) / 16) + dst[0x98] = uint8(((9 * uint32(src[0x24])) + (3 * uint32(src[0x23])) + (3 * uint32(src[0x2C])) + uint32(src[0x2B]) + 8) / 16) + dst[0x99] = uint8(((9 * uint32(src[0x24])) + (3 * uint32(src[0x25])) + (3 * uint32(src[0x2C])) + uint32(src[0x2D]) + 8) / 16) + dst[0x9A] = uint8(((9 * uint32(src[0x25])) + (3 * uint32(src[0x24])) + (3 * uint32(src[0x2D])) + uint32(src[0x2C]) + 8) / 16) + dst[0x9B] = uint8(((9 * uint32(src[0x25])) + (3 * uint32(src[0x26])) + (3 * uint32(src[0x2D])) + uint32(src[0x2E]) + 8) / 16) + dst[0x9C] = uint8(((9 * uint32(src[0x26])) + (3 * uint32(src[0x25])) + (3 * uint32(src[0x2E])) + uint32(src[0x2D]) + 8) / 16) + dst[0x9D] = uint8(((9 * uint32(src[0x26])) + (3 * uint32(src[0x27])) + (3 * uint32(src[0x2E])) + uint32(src[0x2F]) + 8) / 16) + dst[0x9E] = uint8(((9 * uint32(src[0x27])) + (3 * uint32(src[0x26])) + (3 * uint32(src[0x2F])) + uint32(src[0x2E]) + 8) / 16) + dst[0x9F] = uint8(((3 * uint32(src[0x27])) + uint32(src[0x2F]) + 2) / 4) + dst[0xA0] = uint8(((3 * uint32(src[0x28])) + uint32(src[0x20]) + 2) / 4) + dst[0xA1] = uint8(((9 * uint32(src[0x28])) + (3 * uint32(src[0x29])) + (3 * uint32(src[0x20])) + uint32(src[0x21]) + 8) / 16) + dst[0xA2] = uint8(((9 * uint32(src[0x29])) + (3 * uint32(src[0x28])) + (3 * uint32(src[0x21])) + uint32(src[0x20]) + 8) / 16) + dst[0xA3] = uint8(((9 * uint32(src[0x29])) + (3 * uint32(src[0x2A])) + (3 * uint32(src[0x21])) + uint32(src[0x22]) + 8) / 16) + dst[0xA4] = uint8(((9 * uint32(src[0x2A])) + (3 * uint32(src[0x29])) + (3 * uint32(src[0x22])) + uint32(src[0x21]) + 8) / 16) + dst[0xA5] = uint8(((9 * uint32(src[0x2A])) + (3 * uint32(src[0x2B])) + (3 * uint32(src[0x22])) + uint32(src[0x23]) + 8) / 16) + dst[0xA6] = uint8(((9 * uint32(src[0x2B])) + (3 * uint32(src[0x2A])) + (3 * uint32(src[0x23])) + uint32(src[0x22]) + 8) / 16) + dst[0xA7] = uint8(((9 * uint32(src[0x2B])) + (3 * uint32(src[0x2C])) + (3 * uint32(src[0x23])) + uint32(src[0x24]) + 8) / 16) + dst[0xA8] = uint8(((9 * uint32(src[0x2C])) + (3 * uint32(src[0x2B])) + (3 * uint32(src[0x24])) + uint32(src[0x23]) + 8) / 16) + dst[0xA9] = uint8(((9 * uint32(src[0x2C])) + (3 * uint32(src[0x2D])) + (3 * uint32(src[0x24])) + uint32(src[0x25]) + 8) / 16) + dst[0xAA] = uint8(((9 * uint32(src[0x2D])) + (3 * uint32(src[0x2C])) + (3 * uint32(src[0x25])) + uint32(src[0x24]) + 8) / 16) + dst[0xAB] = uint8(((9 * uint32(src[0x2D])) + (3 * uint32(src[0x2E])) + (3 * uint32(src[0x25])) + uint32(src[0x26]) + 8) / 16) + dst[0xAC] = uint8(((9 * uint32(src[0x2E])) + (3 * uint32(src[0x2D])) + (3 * uint32(src[0x26])) + uint32(src[0x25]) + 8) / 16) + dst[0xAD] = uint8(((9 * uint32(src[0x2E])) + (3 * uint32(src[0x2F])) + (3 * uint32(src[0x26])) + uint32(src[0x27]) + 8) / 16) + dst[0xAE] = uint8(((9 * uint32(src[0x2F])) + (3 * uint32(src[0x2E])) + (3 * uint32(src[0x27])) + uint32(src[0x26]) + 8) / 16) + dst[0xAF] = uint8(((3 * uint32(src[0x2F])) + uint32(src[0x27]) + 2) / 4) + dst[0xB0] = uint8(((3 * uint32(src[0x28])) + uint32(src[0x30]) + 2) / 4) + dst[0xB1] = uint8(((9 * uint32(src[0x28])) + (3 * uint32(src[0x29])) + (3 * uint32(src[0x30])) + uint32(src[0x31]) + 8) / 16) + dst[0xB2] = uint8(((9 * uint32(src[0x29])) + (3 * uint32(src[0x28])) + (3 * uint32(src[0x31])) + uint32(src[0x30]) + 8) / 16) + dst[0xB3] = uint8(((9 * uint32(src[0x29])) + (3 * uint32(src[0x2A])) + (3 * uint32(src[0x31])) + uint32(src[0x32]) + 8) / 16) + dst[0xB4] = uint8(((9 * uint32(src[0x2A])) + (3 * uint32(src[0x29])) + (3 * uint32(src[0x32])) + uint32(src[0x31]) + 8) / 16) + dst[0xB5] = uint8(((9 * uint32(src[0x2A])) + (3 * uint32(src[0x2B])) + (3 * uint32(src[0x32])) + uint32(src[0x33]) + 8) / 16) + dst[0xB6] = uint8(((9 * uint32(src[0x2B])) + (3 * uint32(src[0x2A])) + (3 * uint32(src[0x33])) + uint32(src[0x32]) + 8) / 16) + dst[0xB7] = uint8(((9 * uint32(src[0x2B])) + (3 * uint32(src[0x2C])) + (3 * uint32(src[0x33])) + uint32(src[0x34]) + 8) / 16) + dst[0xB8] = uint8(((9 * uint32(src[0x2C])) + (3 * uint32(src[0x2B])) + (3 * uint32(src[0x34])) + uint32(src[0x33]) + 8) / 16) + dst[0xB9] = uint8(((9 * uint32(src[0x2C])) + (3 * uint32(src[0x2D])) + (3 * uint32(src[0x34])) + uint32(src[0x35]) + 8) / 16) + dst[0xBA] = uint8(((9 * uint32(src[0x2D])) + (3 * uint32(src[0x2C])) + (3 * uint32(src[0x35])) + uint32(src[0x34]) + 8) / 16) + dst[0xBB] = uint8(((9 * uint32(src[0x2D])) + (3 * uint32(src[0x2E])) + (3 * uint32(src[0x35])) + uint32(src[0x36]) + 8) / 16) + dst[0xBC] = uint8(((9 * uint32(src[0x2E])) + (3 * uint32(src[0x2D])) + (3 * uint32(src[0x36])) + uint32(src[0x35]) + 8) / 16) + dst[0xBD] = uint8(((9 * uint32(src[0x2E])) + (3 * uint32(src[0x2F])) + (3 * uint32(src[0x36])) + uint32(src[0x37]) + 8) / 16) + dst[0xBE] = uint8(((9 * uint32(src[0x2F])) + (3 * uint32(src[0x2E])) + (3 * uint32(src[0x37])) + uint32(src[0x36]) + 8) / 16) + dst[0xBF] = uint8(((3 * uint32(src[0x2F])) + uint32(src[0x37]) + 2) / 4) + dst[0xC0] = uint8(((3 * uint32(src[0x30])) + uint32(src[0x28]) + 2) / 4) + dst[0xC1] = uint8(((9 * uint32(src[0x30])) + (3 * uint32(src[0x31])) + (3 * uint32(src[0x28])) + uint32(src[0x29]) + 8) / 16) + dst[0xC2] = uint8(((9 * uint32(src[0x31])) + (3 * uint32(src[0x30])) + (3 * uint32(src[0x29])) + uint32(src[0x28]) + 8) / 16) + dst[0xC3] = uint8(((9 * uint32(src[0x31])) + (3 * uint32(src[0x32])) + (3 * uint32(src[0x29])) + uint32(src[0x2A]) + 8) / 16) + dst[0xC4] = uint8(((9 * uint32(src[0x32])) + (3 * uint32(src[0x31])) + (3 * uint32(src[0x2A])) + uint32(src[0x29]) + 8) / 16) + dst[0xC5] = uint8(((9 * uint32(src[0x32])) + (3 * uint32(src[0x33])) + (3 * uint32(src[0x2A])) + uint32(src[0x2B]) + 8) / 16) + dst[0xC6] = uint8(((9 * uint32(src[0x33])) + (3 * uint32(src[0x32])) + (3 * uint32(src[0x2B])) + uint32(src[0x2A]) + 8) / 16) + dst[0xC7] = uint8(((9 * uint32(src[0x33])) + (3 * uint32(src[0x34])) + (3 * uint32(src[0x2B])) + uint32(src[0x2C]) + 8) / 16) + dst[0xC8] = uint8(((9 * uint32(src[0x34])) + (3 * uint32(src[0x33])) + (3 * uint32(src[0x2C])) + uint32(src[0x2B]) + 8) / 16) + dst[0xC9] = uint8(((9 * uint32(src[0x34])) + (3 * uint32(src[0x35])) + (3 * uint32(src[0x2C])) + uint32(src[0x2D]) + 8) / 16) + dst[0xCA] = uint8(((9 * uint32(src[0x35])) + (3 * uint32(src[0x34])) + (3 * uint32(src[0x2D])) + uint32(src[0x2C]) + 8) / 16) + dst[0xCB] = uint8(((9 * uint32(src[0x35])) + (3 * uint32(src[0x36])) + (3 * uint32(src[0x2D])) + uint32(src[0x2E]) + 8) / 16) + dst[0xCC] = uint8(((9 * uint32(src[0x36])) + (3 * uint32(src[0x35])) + (3 * uint32(src[0x2E])) + uint32(src[0x2D]) + 8) / 16) + dst[0xCD] = uint8(((9 * uint32(src[0x36])) + (3 * uint32(src[0x37])) + (3 * uint32(src[0x2E])) + uint32(src[0x2F]) + 8) / 16) + dst[0xCE] = uint8(((9 * uint32(src[0x37])) + (3 * uint32(src[0x36])) + (3 * uint32(src[0x2F])) + uint32(src[0x2E]) + 8) / 16) + dst[0xCF] = uint8(((3 * uint32(src[0x37])) + uint32(src[0x2F]) + 2) / 4) + dst[0xD0] = uint8(((3 * uint32(src[0x30])) + uint32(src[0x38]) + 2) / 4) + dst[0xD1] = uint8(((9 * uint32(src[0x30])) + (3 * uint32(src[0x31])) + (3 * uint32(src[0x38])) + uint32(src[0x39]) + 8) / 16) + dst[0xD2] = uint8(((9 * uint32(src[0x31])) + (3 * uint32(src[0x30])) + (3 * uint32(src[0x39])) + uint32(src[0x38]) + 8) / 16) + dst[0xD3] = uint8(((9 * uint32(src[0x31])) + (3 * uint32(src[0x32])) + (3 * uint32(src[0x39])) + uint32(src[0x3A]) + 8) / 16) + dst[0xD4] = uint8(((9 * uint32(src[0x32])) + (3 * uint32(src[0x31])) + (3 * uint32(src[0x3A])) + uint32(src[0x39]) + 8) / 16) + dst[0xD5] = uint8(((9 * uint32(src[0x32])) + (3 * uint32(src[0x33])) + (3 * uint32(src[0x3A])) + uint32(src[0x3B]) + 8) / 16) + dst[0xD6] = uint8(((9 * uint32(src[0x33])) + (3 * uint32(src[0x32])) + (3 * uint32(src[0x3B])) + uint32(src[0x3A]) + 8) / 16) + dst[0xD7] = uint8(((9 * uint32(src[0x33])) + (3 * uint32(src[0x34])) + (3 * uint32(src[0x3B])) + uint32(src[0x3C]) + 8) / 16) + dst[0xD8] = uint8(((9 * uint32(src[0x34])) + (3 * uint32(src[0x33])) + (3 * uint32(src[0x3C])) + uint32(src[0x3B]) + 8) / 16) + dst[0xD9] = uint8(((9 * uint32(src[0x34])) + (3 * uint32(src[0x35])) + (3 * uint32(src[0x3C])) + uint32(src[0x3D]) + 8) / 16) + dst[0xDA] = uint8(((9 * uint32(src[0x35])) + (3 * uint32(src[0x34])) + (3 * uint32(src[0x3D])) + uint32(src[0x3C]) + 8) / 16) + dst[0xDB] = uint8(((9 * uint32(src[0x35])) + (3 * uint32(src[0x36])) + (3 * uint32(src[0x3D])) + uint32(src[0x3E]) + 8) / 16) + dst[0xDC] = uint8(((9 * uint32(src[0x36])) + (3 * uint32(src[0x35])) + (3 * uint32(src[0x3E])) + uint32(src[0x3D]) + 8) / 16) + dst[0xDD] = uint8(((9 * uint32(src[0x36])) + (3 * uint32(src[0x37])) + (3 * uint32(src[0x3E])) + uint32(src[0x3F]) + 8) / 16) + dst[0xDE] = uint8(((9 * uint32(src[0x37])) + (3 * uint32(src[0x36])) + (3 * uint32(src[0x3F])) + uint32(src[0x3E]) + 8) / 16) + dst[0xDF] = uint8(((3 * uint32(src[0x37])) + uint32(src[0x3F]) + 2) / 4) + dst[0xE0] = uint8(((3 * uint32(src[0x38])) + uint32(src[0x30]) + 2) / 4) + dst[0xE1] = uint8(((9 * uint32(src[0x38])) + (3 * uint32(src[0x39])) + (3 * uint32(src[0x30])) + uint32(src[0x31]) + 8) / 16) + dst[0xE2] = uint8(((9 * uint32(src[0x39])) + (3 * uint32(src[0x38])) + (3 * uint32(src[0x31])) + uint32(src[0x30]) + 8) / 16) + dst[0xE3] = uint8(((9 * uint32(src[0x39])) + (3 * uint32(src[0x3A])) + (3 * uint32(src[0x31])) + uint32(src[0x32]) + 8) / 16) + dst[0xE4] = uint8(((9 * uint32(src[0x3A])) + (3 * uint32(src[0x39])) + (3 * uint32(src[0x32])) + uint32(src[0x31]) + 8) / 16) + dst[0xE5] = uint8(((9 * uint32(src[0x3A])) + (3 * uint32(src[0x3B])) + (3 * uint32(src[0x32])) + uint32(src[0x33]) + 8) / 16) + dst[0xE6] = uint8(((9 * uint32(src[0x3B])) + (3 * uint32(src[0x3A])) + (3 * uint32(src[0x33])) + uint32(src[0x32]) + 8) / 16) + dst[0xE7] = uint8(((9 * uint32(src[0x3B])) + (3 * uint32(src[0x3C])) + (3 * uint32(src[0x33])) + uint32(src[0x34]) + 8) / 16) + dst[0xE8] = uint8(((9 * uint32(src[0x3C])) + (3 * uint32(src[0x3B])) + (3 * uint32(src[0x34])) + uint32(src[0x33]) + 8) / 16) + dst[0xE9] = uint8(((9 * uint32(src[0x3C])) + (3 * uint32(src[0x3D])) + (3 * uint32(src[0x34])) + uint32(src[0x35]) + 8) / 16) + dst[0xEA] = uint8(((9 * uint32(src[0x3D])) + (3 * uint32(src[0x3C])) + (3 * uint32(src[0x35])) + uint32(src[0x34]) + 8) / 16) + dst[0xEB] = uint8(((9 * uint32(src[0x3D])) + (3 * uint32(src[0x3E])) + (3 * uint32(src[0x35])) + uint32(src[0x36]) + 8) / 16) + dst[0xEC] = uint8(((9 * uint32(src[0x3E])) + (3 * uint32(src[0x3D])) + (3 * uint32(src[0x36])) + uint32(src[0x35]) + 8) / 16) + dst[0xED] = uint8(((9 * uint32(src[0x3E])) + (3 * uint32(src[0x3F])) + (3 * uint32(src[0x36])) + uint32(src[0x37]) + 8) / 16) + dst[0xEE] = uint8(((9 * uint32(src[0x3F])) + (3 * uint32(src[0x3E])) + (3 * uint32(src[0x37])) + uint32(src[0x36]) + 8) / 16) + dst[0xEF] = uint8(((3 * uint32(src[0x3F])) + uint32(src[0x37]) + 2) / 4) + dst[0xF0] = src[0x38] + dst[0xF1] = uint8(((3 * uint32(src[0x38])) + uint32(src[0x39]) + 2) / 4) + dst[0xF2] = uint8(((3 * uint32(src[0x39])) + uint32(src[0x38]) + 2) / 4) + dst[0xF3] = uint8(((3 * uint32(src[0x39])) + uint32(src[0x3A]) + 2) / 4) + dst[0xF4] = uint8(((3 * uint32(src[0x3A])) + uint32(src[0x39]) + 2) / 4) + dst[0xF5] = uint8(((3 * uint32(src[0x3A])) + uint32(src[0x3B]) + 2) / 4) + dst[0xF6] = uint8(((3 * uint32(src[0x3B])) + uint32(src[0x3A]) + 2) / 4) + dst[0xF7] = uint8(((3 * uint32(src[0x3B])) + uint32(src[0x3C]) + 2) / 4) + dst[0xF8] = uint8(((3 * uint32(src[0x3C])) + uint32(src[0x3B]) + 2) / 4) + dst[0xF9] = uint8(((3 * uint32(src[0x3C])) + uint32(src[0x3D]) + 2) / 4) + dst[0xFA] = uint8(((3 * uint32(src[0x3D])) + uint32(src[0x3C]) + 2) / 4) + dst[0xFB] = uint8(((3 * uint32(src[0x3D])) + uint32(src[0x3E]) + 2) / 4) + dst[0xFC] = uint8(((3 * uint32(src[0x3E])) + uint32(src[0x3D]) + 2) / 4) + dst[0xFD] = uint8(((3 * uint32(src[0x3E])) + uint32(src[0x3F]) + 2) / 4) + dst[0xFE] = uint8(((3 * uint32(src[0x3F])) + uint32(src[0x3E]) + 2) / 4) + dst[0xFF] = src[0x3F] +} + const hardCodedDHTSegments = "" + // 212 bytes for the first DHT segment. "\xFF\xC4\x00\xD2\x00\x00\x01\x05\x01\x01\x01\x01\x01\x01\x00\x00" + diff --git a/lib/lowleveljpeg/extract.go b/lib/lowleveljpeg/extract.go index 517ca0bf..97d6a618 100644 --- a/lib/lowleveljpeg/extract.go +++ b/lib/lowleveljpeg/extract.go @@ -147,8 +147,15 @@ func (dst *Array6BlockU8) ExtractFrom(m image.Image, topLeftX int, topLeftY int) dst[2] = tmp[2][0] dst[3] = tmp[3][0] - downsample8x8(&dst[4], &tmp[0][1], &tmp[1][1], &tmp[2][1], &tmp[3][1]) - downsample8x8(&dst[5], &tmp[0][2], &tmp[1][2], &tmp[2][2], &tmp[3][2]) + downsample4x4(dst[4][0x00:], &tmp[0][1]) + downsample4x4(dst[4][0x04:], &tmp[1][1]) + downsample4x4(dst[4][0x20:], &tmp[2][1]) + downsample4x4(dst[4][0x24:], &tmp[3][1]) + + downsample4x4(dst[5][0x00:], &tmp[0][2]) + downsample4x4(dst[5][0x04:], &tmp[1][2]) + downsample4x4(dst[5][0x20:], &tmp[2][2]) + downsample4x4(dst[5][0x24:], &tmp[3][2]) } // fillRightAndDown copies the right and bottom edge values to the full 8×8 block. @@ -212,25 +219,32 @@ func fillRightAndDown(b *BlockU8, topLeftX int, topLeftY int, bottomRightX int, } } -// downsample8x8 reduces four 8×8 blocks to one 8×8 block. -func downsample8x8(dst *BlockU8, src0 *BlockU8, src1 *BlockU8, src2 *BlockU8, src3 *BlockU8) { - downsample4x4(dst[0x00:], src0) - downsample4x4(dst[0x04:], src1) - downsample4x4(dst[0x20:], src2) - downsample4x4(dst[0x24:], src3) -} - // downsample4x4 reduces one 8×8 block to one 4×4 sub-block. func downsample4x4(dst []uint8, src *BlockU8) { for y := 0; y < 4; y++ { for x := 0; x < 4; x++ { - d := (8 * y) + (1 * x) - s := (16 * y) + (2 * x) + d := (y << 3) | (x << 0) + s := (y << 4) | (x << 1) dst[d] = uint8((2 + - uint32(src[s+0]) + - uint32(src[s+1]) + - uint32(src[s+8]) + - uint32(src[s+9])) / 4) + uint32(src[s+0x00]) + + uint32(src[s+0x01]) + + uint32(src[s+0x08]) + + uint32(src[s+0x09])) / 4) + } + } +} + +// DownsampleFrom reduces one 16×16 quad-block to one 8×8 block. +func (dst *BlockU8) DownsampleFrom(src *QuadBlockU8) { + for y := 0; y < 8; y++ { + for x := 0; x < 8; x++ { + d := (y << 3) | (x << 0) + s := (y << 5) | (x << 1) + dst[d] = uint8((2 + + uint32(src[s+0x00]) + + uint32(src[s+0x01]) + + uint32(src[s+0x10]) + + uint32(src[s+0x11])) / 4) } } } diff --git a/lib/lowleveljpeg/gen.go b/lib/lowleveljpeg/gen.go index 94450605..a51b63b2 100644 --- a/lib/lowleveljpeg/gen.go +++ b/lib/lowleveljpeg/gen.go @@ -32,6 +32,8 @@ func main1() error { w := &bytes.Buffer{} w.WriteString(header) + genUpsampleFrom(w) + w.WriteString("\n") genHardCodedDHTSegments(w) w.WriteString("\n") genHuffmanBitWriters(w) @@ -39,6 +41,48 @@ func main1() error { return os.WriteFile("data.go", w.Bytes(), 0644) } +func genUpsampleFrom(w *bytes.Buffer) { + w.WriteString("// UpsampleFrom produces one 16×16 quad-block from one 8×8 block.\n") + w.WriteString("//\n") + w.WriteString("// It uses a triangle filter.\n") + w.WriteString("func (dst *QuadBlockU8) UpsampleFrom(src *BlockU8) {\n") + w.WriteString("\tif (dst == nil) || (src == nil) {\n\t\treturn\n\t}\n") + for y := 0; y < 16; y++ { + for x := 0; x < 16; x++ { + d := (y << 4) | x + + s0 := ((y >> 1) << 3) | (x >> 1) + sx := ((x & 1) * 2) - 1 + sy := ((y & 1) * 16) - 8 + + // Handle corners. + if ((x == 0x00) || (x == 0x0F)) && ((y == 0x00) || (y == 0x0F)) { + fmt.Fprintf(w, "\tdst[0x%02X] = src[0x%02X]\n", d, s0) + continue + } + + // Handle top and bottom edges. + if (y == 0x00) || (y == 0x0F) { + fmt.Fprintf(w, "\tdst[0x%02X] = uint8(((3 * uint32(src[0x%02X])) + uint32(src[0x%02X]) + 2) / 4)\n", d, s0, s0+sx) + continue + } + + // Handle left and right edges. + if (x == 0x00) || (x == 0x0F) { + fmt.Fprintf(w, "\tdst[0x%02X] = uint8(((3 * uint32(src[0x%02X])) + uint32(src[0x%02X]) + 2) / 4)\n", d, s0, s0+sy) + continue + } + + fmt.Fprintf(w, "\tdst[0x%02X] = uint8(("+ + "(9 * uint32(src[0x%02X])) + "+ + "(3 * uint32(src[0x%02X])) + "+ + "(3 * uint32(src[0x%02X])) + "+ + "uint32(src[0x%02X]) + 8) / 16)\n", d, s0, s0+sx, s0+sy, s0+sx+sy) + } + } + w.WriteString("}\n") +} + func fillInPlaceholderPayloadLength(payload []byte) { n := len(payload) - 2 // Minus 2 for the JPEG marker. payload[2] = uint8(n >> 8) diff --git a/lib/lowleveljpeg/lowleveljpeg_test.go b/lib/lowleveljpeg/lowleveljpeg_test.go index d7c81ab5..cb6bd1f1 100644 --- a/lib/lowleveljpeg/lowleveljpeg_test.go +++ b/lib/lowleveljpeg/lowleveljpeg_test.go @@ -19,20 +19,20 @@ import ( ) var ( - // pjw8x8 is test/data/pjw-thumbnail.png scaled down to 8×8. - pjw8x8 = [...]uint8{ + // pjw8x8 is test/data/pjw-thumbnail.png scaled down to 16×16 and then 8×8. + pjw8x8 = BlockU8{ 0xFF, 0xFF, 0xAF, 0x40, 0x50, 0xBF, 0xFF, 0xFF, 0xFF, 0xEF, 0xEF, 0xFF, 0x40, 0x00, 0x50, 0xFF, - 0xFF, 0x60, 0xDF, 0xFF, 0xAF, 0x00, 0x00, 0xCF, - 0x9F, 0x00, 0x8F, 0x70, 0x10, 0x00, 0x00, 0xEF, - 0xEF, 0x8F, 0xCF, 0xAF, 0x50, 0x20, 0x60, 0xFF, - 0xFF, 0xAF, 0xCF, 0x8F, 0x20, 0x20, 0x80, 0xFF, - 0xFF, 0xFF, 0xCF, 0x9F, 0x30, 0x50, 0xEF, 0xFF, - 0xFF, 0xFF, 0xAF, 0x20, 0x00, 0x70, 0xFF, 0xFF, + 0xFF, 0x60, 0xDF, 0xFF, 0xB0, 0x00, 0x00, 0xCF, + 0xA0, 0x00, 0x90, 0x70, 0x10, 0x00, 0x00, 0xEF, + 0xEF, 0x8F, 0xCF, 0xB0, 0x50, 0x20, 0x60, 0xFF, + 0xFF, 0xB0, 0xCF, 0x90, 0x20, 0x20, 0x80, 0xFF, + 0xFF, 0xFF, 0xCF, 0xA0, 0x30, 0x50, 0xEF, 0xFF, + 0xFF, 0xFF, 0xB0, 0x20, 0x00, 0x70, 0xFF, 0xFF, } // pjw16x16 is test/data/pjw-thumbnail.png scaled down to 16×16. - pjw16x16 = [...]uint8{ + pjw16x16 = QuadBlockU8{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x80, 0x80, 0x80, 0xBF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x40, 0xBF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0xFF, 0xFF, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x40, 0xBF, 0xFF, 0xFF, @@ -323,3 +323,38 @@ func TestNoAllocation(tt *testing.T) { tt.Fatalf("AllocsPerRun: got %v, want 0", got) } } + +func TestDownsampleFrom(tt *testing.T) { + dst := BlockU8{} + dst.DownsampleFrom(&pjw16x16) + if dst != pjw8x8 { + tt.Fatalf("got:\n%v\nwant:\n%v", dst, pjw8x8) + } +} + +func TestUpsampleFrom(tt *testing.T) { + want := QuadBlockU8{ + 0xFF, 0xFF, 0xFF, 0xEB, 0xC3, 0x93, 0x5C, 0x44, 0x4C, 0x6C, 0xA3, 0xCF, 0xEF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFE, 0xFC, 0xEC, 0xCE, 0xAB, 0x84, 0x67, 0x55, 0x5D, 0x7E, 0xA0, 0xC2, 0xDE, 0xF4, 0xFF, + 0xFF, 0xFC, 0xF6, 0xEE, 0xE4, 0xDB, 0xD3, 0xAC, 0x67, 0x3F, 0x35, 0x43, 0x69, 0x9D, 0xDE, 0xFF, + 0xFF, 0xF2, 0xD8, 0xD3, 0xE3, 0xF0, 0xFA, 0xD6, 0x85, 0x45, 0x17, 0x0F, 0x2D, 0x6A, 0xC5, 0xF3, + 0xFF, 0xE0, 0xA3, 0x9C, 0xCB, 0xEA, 0xF8, 0xE4, 0xAF, 0x6F, 0x25, 0x05, 0x0F, 0x46, 0xA9, 0xDB, + 0xE7, 0xBF, 0x70, 0x69, 0xAA, 0xCF, 0xD7, 0xC6, 0x9D, 0x66, 0x22, 0x00, 0x00, 0x36, 0xA1, 0xD7, + 0xB8, 0x90, 0x40, 0x3B, 0x81, 0xA0, 0x98, 0x7D, 0x4F, 0x2A, 0x0E, 0x00, 0x00, 0x3A, 0xAD, 0xE7, + 0xB4, 0x90, 0x48, 0x43, 0x81, 0x98, 0x88, 0x68, 0x38, 0x1A, 0x0E, 0x0C, 0x14, 0x4F, 0xBC, 0xF3, + 0xDB, 0xBF, 0x87, 0x80, 0xAA, 0xB7, 0xA8, 0x88, 0x58, 0x36, 0x22, 0x24, 0x3C, 0x75, 0xCE, 0xFB, + 0xF3, 0xDC, 0xAE, 0xA5, 0xC1, 0xC5, 0xB2, 0x8F, 0x5D, 0x3B, 0x29, 0x32, 0x56, 0x8E, 0xD9, 0xFF, + 0xFB, 0xE6, 0xBD, 0xB2, 0xC5, 0xC1, 0xA6, 0x7D, 0x47, 0x29, 0x23, 0x36, 0x62, 0x9A, 0xDD, 0xFF, + 0xFF, 0xF0, 0xD3, 0xC7, 0xCC, 0xC0, 0xA3, 0x78, 0x40, 0x26, 0x2A, 0x48, 0x80, 0xB5, 0xE6, 0xFF, + 0xFF, 0xFA, 0xF0, 0xE4, 0xD6, 0xC2, 0xA9, 0x80, 0x48, 0x32, 0x3E, 0x68, 0xAF, 0xDE, 0xF4, 0xFF, + 0xFF, 0xFF, 0xFF, 0xF1, 0xD5, 0xB5, 0x92, 0x69, 0x3B, 0x31, 0x4B, 0x7F, 0xCC, 0xF6, 0xFC, 0xFF, + 0xFF, 0xFF, 0xFF, 0xED, 0xCA, 0x9A, 0x5E, 0x33, 0x19, 0x23, 0x51, 0x8D, 0xD6, 0xFC, 0xFE, 0xFF, + 0xFF, 0xFF, 0xFF, 0xEB, 0xC4, 0x8C, 0x44, 0x18, 0x08, 0x1C, 0x54, 0x94, 0xDB, 0xFF, 0xFF, 0xFF, + } + + dst := QuadBlockU8{} + dst.UpsampleFrom(&pjw8x8) + if dst != want { + tt.Fatalf("got:\n%v\nwant:\n%v", dst, want) + } +}