From 27a3197727d69deb81ad7e1e295f140b558b4cf9 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 1 Jun 2023 22:25:41 +1000 Subject: [PATCH] script: add truncate-progressive-jpeg.go "script/confirm-matches-djpeg.sh test/data/*.jpeg" shows differences on "test/data/peacock.progressive.scan00[0-8].jpeg". --- script/truncate-progressive-jpeg.go | 108 +++++++++++++++++++++ std/jpeg/decode_jpeg.wuffs | 23 +++-- test/data/README.md | 2 + test/data/peacock.png | Bin 0 -> 13391 bytes test/data/peacock.progressive.scan000.jpeg | Bin 0 -> 405 bytes test/data/peacock.progressive.scan001.jpeg | Bin 0 -> 718 bytes test/data/peacock.progressive.scan002.jpeg | Bin 0 -> 816 bytes test/data/peacock.progressive.scan003.jpeg | Bin 0 -> 910 bytes test/data/peacock.progressive.scan004.jpeg | Bin 0 -> 1080 bytes test/data/peacock.progressive.scan005.jpeg | Bin 0 -> 1418 bytes test/data/peacock.progressive.scan006.jpeg | Bin 0 -> 1460 bytes test/data/peacock.progressive.scan007.jpeg | Bin 0 -> 1567 bytes test/data/peacock.progressive.scan008.jpeg | Bin 0 -> 1670 bytes test/data/peacock.progressive.scan009.jpeg | Bin 0 -> 2220 bytes test/nia-checksums-of-data.txt | 11 +++ 15 files changed, 134 insertions(+), 10 deletions(-) create mode 100644 script/truncate-progressive-jpeg.go create mode 100644 test/data/peacock.png create mode 100644 test/data/peacock.progressive.scan000.jpeg create mode 100644 test/data/peacock.progressive.scan001.jpeg create mode 100644 test/data/peacock.progressive.scan002.jpeg create mode 100644 test/data/peacock.progressive.scan003.jpeg create mode 100644 test/data/peacock.progressive.scan004.jpeg create mode 100644 test/data/peacock.progressive.scan005.jpeg create mode 100644 test/data/peacock.progressive.scan006.jpeg create mode 100644 test/data/peacock.progressive.scan007.jpeg create mode 100644 test/data/peacock.progressive.scan008.jpeg create mode 100644 test/data/peacock.progressive.scan009.jpeg diff --git a/script/truncate-progressive-jpeg.go b/script/truncate-progressive-jpeg.go new file mode 100644 index 00000000..3ae97d40 --- /dev/null +++ b/script/truncate-progressive-jpeg.go @@ -0,0 +1,108 @@ +// Copyright 2023 The Wuffs Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//go:build ignore +// +build ignore + +package main + +// truncate-progressive-jpeg.go saves truncated editions of a JPEG, cutting +// just after every SOS (Start Of Scan) marker, appending an EOI (End Of Image) +// marker after the cut. +// +// Usage: go run truncate-progressive-jpeg.go foo.jpeg + +import ( + "fmt" + "os" + "strings" +) + +func main() { + if err := main1(); err != nil { + os.Stderr.WriteString(err.Error() + "\n") + os.Exit(1) + } +} + +func main1() error { + if len(os.Args) < 2 { + return fmt.Errorf("usage: progname filename.jpeg") + } + src, err := os.ReadFile(os.Args[1]) + if err != nil { + return err + } + prefix, suffix := os.Args[1], ".jpeg" + if strings.HasSuffix(prefix, ".jpg") { + prefix = prefix[:len(prefix)-4] + suffix = ".jpg" + } else if strings.HasSuffix(prefix, ".jpeg") { + prefix = prefix[:len(prefix)-5] + } + + if len(src) < 2 { + return fmt.Errorf("invalid JPEG") + } + scanNumber := 0 + for pos := 0; pos <= (len(src) - 2); { + if src[pos] != 0xFF { + return fmt.Errorf("invalid JPEG") + } + marker := src[pos+1] + pos += 2 + switch { + case (0xD0 <= marker) && (marker < 0xD9): + // RSTn (Restart) and SOI (Start Of Image) markers have no payload. + continue + case marker == 0xD9: + // EOI (End Of Image) marker. + return nil + } + + if pos >= (len(src) - 2) { + return fmt.Errorf("invalid JPEG") + } + payloadLength := (int(src[pos]) << 8) | int(src[pos+1]) + pos += payloadLength + if (payloadLength < 2) || (pos < 0) || (pos > len(src)) { + return fmt.Errorf("invalid JPEG") + } + + if marker != 0xDA { // SOS (Start Of Scan) marker. + continue + } + for pos < len(src) { + if src[pos] != 0xFF { + pos += 1 + } else if pos >= (len(src) - 1) { + return fmt.Errorf("invalid JPEG") + } else if src[pos+1] != 0x00 { + break + } else { + pos += 2 + } + } + outName := fmt.Sprintf("%s.scan%03d%s", prefix, scanNumber, suffix) + scanNumber++ + data := ([]byte)(nil) + data = append(data, src[:pos]...) + data = append(data, "\xFF\xD9"...) // Append an EOI marker. + if err := os.WriteFile(outName, data, 0666); err != nil { + return err + } + fmt.Printf("Wrote %s (cut at 0x%08X = %6d bytes).\n", outName, pos, pos) + } + return fmt.Errorf("invalid JPEG") +} diff --git a/std/jpeg/decode_jpeg.wuffs b/std/jpeg/decode_jpeg.wuffs index a7790849..4f8bf3df 100644 --- a/std/jpeg/decode_jpeg.wuffs +++ b/std/jpeg/decode_jpeg.wuffs @@ -146,16 +146,19 @@ pub struct decoder? implements base.image_decoder( // is a special case, meaning the scan holds (8 - Al) bits. // // The test/data/peacock.progressive.jpeg file has 10 scans: - // 1. Ss = 0 Se = 0 Ah = 0 Al = 1 3 components (Y, Cb, Cr) - // 2. Ss = 1 Se = 5 Ah = 0 Al = 2 1 component (Y) - // 3. Ss = 1 Se = 63 Ah = 0 Al = 1 1 component (Cr) - // 4. Ss = 1 Se = 63 Ah = 0 Al = 1 1 component (Cb) - // 5. Ss = 6 Se = 63 Ah = 0 Al = 2 1 component (Y) - // 6. Ss = 1 Se = 63 Ah = 2 Al = 1 1 component (Y) - // 7. Ss = 0 Se = 0 Ah = 1 Al = 0 3 components (Y, Cb, Cr) - // 8. Ss = 1 Se = 63 Ah = 1 Al = 0 1 component (Cr) - // 9. Ss = 1 Se = 63 Ah = 1 Al = 0 1 component (Cb) - // 10. Ss = 1 Se = 63 Ah = 1 Al = 0 1 component (Y) + // 0: Ss = 0 Se = 0 Ah = 0 Al = 1 3 components (Y, Cb, Cr) + // 1: Ss = 1 Se = 5 Ah = 0 Al = 2 1 component (Y) + // 2: Ss = 1 Se = 63 Ah = 0 Al = 1 1 component (Cr) + // 3: Ss = 1 Se = 63 Ah = 0 Al = 1 1 component (Cb) + // 4: Ss = 6 Se = 63 Ah = 0 Al = 2 1 component (Y) + // 5: Ss = 1 Se = 63 Ah = 2 Al = 1 1 component (Y) + // 6: Ss = 0 Se = 0 Ah = 1 Al = 0 3 components (Y, Cb, Cr) + // 7: Ss = 1 Se = 63 Ah = 1 Al = 0 1 component (Cr) + // 8: Ss = 1 Se = 63 Ah = 1 Al = 0 1 component (Cb) + // 9: Ss = 1 Se = 63 Ah = 1 Al = 0 1 component (Y) + // + // This matches /usr/bin/cjpeg's default script for progressive YCbCr: + // https://github.com/libjpeg-turbo/libjpeg-turbo/blob/2192560d74e6e6cf99dd05928885573be00a8208/jcparam.c#L517-L535 // // The first scan holds the high 7 bits of all components' DC // coefficients. diff --git a/test/data/README.md b/test/data/README.md index d47a8e82..58dacc9d 100644 --- a/test/data/README.md +++ b/test/data/README.md @@ -126,6 +126,7 @@ image](https://commons.wikimedia.org/wiki/File:Pavo_Real_Venezolano.jpg), Dedication": - `wget --quiet https://upload.wikimedia.org/wikipedia/commons/thumb/6/6f/Pavo_Real_Venezolano.jpg/1024px-Pavo_Real_Venezolano.jpg` - `convert 1024px-Pavo_Real_Venezolano.jpg -resize 100x75 peacock.ppm` + - `convert peacock.ppm peacock.png` - `rm 1024px-Pavo_Real_Venezolano.jpg` - `cjpeg peacock.ppm > peacock.default.jpeg` - `cjpeg -optimize peacock.ppm > peacock.optimize.jpeg` @@ -137,6 +138,7 @@ Dedication": - `cjpeg -sample 2x1 peacock.ppm > peacock.s2x1-422.jpeg` - `cjpeg -sample 1x1 peacock.ppm > peacock.s1x1-444.jpeg` - `cjpeg -sample 2x2,2x1,1x1 peacock.ppm > peacock.s-weird.jpeg` + - `go run ../../script/truncate-progressive-jpeg.go peacock.progressive.jpeg` `pi.txt` contains the digits of pi. diff --git a/test/data/peacock.png b/test/data/peacock.png new file mode 100644 index 0000000000000000000000000000000000000000..e3037b5862ee24129ee1c5487cc03fb76c42094e GIT binary patch literal 13391 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 literal 0 HcmV?d00001 diff --git a/test/data/peacock.progressive.scan000.jpeg b/test/data/peacock.progressive.scan000.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..5cc37e004fc92f82ee046001aaefa6b14e5024d3 GIT binary patch literal 405 zcmex=oIr{vToxnYz6D!Xe%amdT;6A1_2H&YNJY zWjptc!iO_Ip9lsn*?K00S8Tr7t%b8s_~?Die)H+9MZjxIXDbgG<9PNDUNe|W+E|~u zBsXgJ^30vJtVMm%Lf3D>b;}Al&i=4n7OVG0AUmP6^-z&^yWl+2_xjOl$L{UaQ{CLR saoUI4JvXv89?YDzxmRa>)w1bRfAQ~Bldzs%uy$$Le71)F4F7Ke0JlbQ!~g&Q literal 0 HcmV?d00001 diff --git a/test/data/peacock.progressive.scan001.jpeg b/test/data/peacock.progressive.scan001.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..983328bc6f257ffe559cbed3a818728f372114d9 GIT binary patch literal 718 zcmex=oIr{vToxnYz6D!Xe%amdT;6A1_2H&YNJY zWjptc!iO_Ip9lsn*?K00S8Tr7t%b8s_~?Die)H+9MZjxIXDbgG<9PNDUNe|W+E|~u zBsXgJ^30vJtVMm%Lf3D>b;}Al&i=4n7OVG0AUmP6^-z&^yWl+2_xjOl$L{UaQ{CLR zaoUI4JvXv89?YDzxmRa>)w1bRfAQ~Bldzs%uy$$Le71)F4F8WXs0c7HF)=YSFflVQ zgZ;q3$i%?RA}A!RsAR}0VkDq!{QnjM2O}c`BP-M5cl(#idGnv1v;E1Pn#ymbhPQkC zpVmx`D2X`6W|8MD;bfC~XRWhs_pt!87f1BvLlb^KQr+6QZPVG`p)GRCHD7$>V?=JwD3&!7|abCbg3+tw}5SugLCewO<8r`PT>k)7rYJGXtFVGy}MFZ0HS zh-YG%XP1886f*T)(v`$JH?OWXXnAbDf+vv6G4AnyhHdvn3*vY6&Ag!I%b>^cpF!$Q z)YCfO&e}z*wB;ho4c`2%u4b6K+9)?RX`aIER|mhOo6XdzTHX71%fikz?*CrO$?yMv F697_I{eb`g literal 0 HcmV?d00001 diff --git a/test/data/peacock.progressive.scan002.jpeg b/test/data/peacock.progressive.scan002.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..e065a63ef6c4e96e84b01b5d155798e5bedee767 GIT binary patch literal 816 zcmex=oIr{vToxnYz6D!Xe%amdT;6A1_2H&YNJY zWjptc!iO_Ip9lsn*?K00S8Tr7t%b8s_~?Die)H+9MZjxIXDbgG<9PNDUNe|W+E|~u zBsXgJ^30vJtVMm%Lf3D>b;}Al&i=4n7OVG0AUmP6^-z&^yWl+2_xjOl$L{UaQ{CLR zaoUI4JvXv89?YDzxmRa>)w1bRfAQ~Bldzs%uy$$Le71)F4F8WXs0c7HF)=YSFflVQ zgZ;q3$i%?RA}A!RsAR}0VkDq!{QnjM2O}c`BP-M5cl(#idGnv1v;E1Pn#ymbhPQkC zpVmx`D2X`6W|8MD;bfC~XRWhs_pt!87f1BvLlb^KQr+6QZPVG`p)GRCHD7$>V?=JwD3&!7|abCbg3+tw}5SugLCewO<8r`PT>k)7rYJGXtFVGy}MFZ0HS zh-YG%XP1886f*T)(v`$JH?OWXXnAbDf+vv6G4AnyhHdvn3*vY6&Ag!I%b>^cpF!$Q z)YCfO&e}z*wB;ho4c`2%u4b6K+9)?RX`aIER|mhOo6XdzTHX71%fikz?*CrO$?yMv zgh5dd6mX0z&`<+~9V3$C)E8KXMW!(J?&FuP;X#x0M|{9V+( sEpYnxKsifG?Jw1u?dyZ`_I literal 0 HcmV?d00001 diff --git a/test/data/peacock.progressive.scan003.jpeg b/test/data/peacock.progressive.scan003.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..6c63c1b5e740561998bed934a695bab1797b85e0 GIT binary patch literal 910 zcmex=oIr{vToxnYz6D!Xe%amdT;6A1_2H&YNJY zWjptc!iO_Ip9lsn*?K00S8Tr7t%b8s_~?Die)H+9MZjxIXDbgG<9PNDUNe|W+E|~u zBsXgJ^30vJtVMm%Lf3D>b;}Al&i=4n7OVG0AUmP6^-z&^yWl+2_xjOl$L{UaQ{CLR zaoUI4JvXv89?YDzxmRa>)w1bRfAQ~Bldzs%uy$$Le71)F4F8WXs0c7HF)=YSFflVQ zgZ;q3$i%?RA}A!RsAR}0VkDq!{QnjM2O}c`BP-M5cl(#idGnv1v;E1Pn#ymbhPQkC zpVmx`D2X`6W|8MD;bfC~XRWhs_pt!87f1BvLlb^KQr+6QZPVG`p)GRCHD7$>V?=JwD3&!7|abCbg3+tw}5SugLCewO<8r`PT>k)7rYJGXtFVGy}MFZ0HS zh-YG%XP1886f*T)(v`$JH?OWXXnAbDf+vv6G4AnyhHdvn3*vY6&Ag!I%b>^cpF!$Q z)YCfO&e}z*wB;ho4c`2%u4b6K+9)?RX`aIER|mhOo6XdzTHX71%fikz?*CrO$?yMv zgh5dd6mX0z&`<+~9V3$C)E8KXMW!(J?&FuP;X#x0M|{9V+( zEpYnxKsifG?Jw1u?D79E`y> z2r04{3M(jqEnos!ASu);zf?k~F(qVr%5-s;t^aQV0B-s|WB>pF literal 0 HcmV?d00001 diff --git a/test/data/peacock.progressive.scan004.jpeg b/test/data/peacock.progressive.scan004.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..4bb46e9bb1690e0347bda8b9b35aeb0136b98d07 GIT binary patch literal 1080 zcmex=oIr{vToxnYz6D!Xe%amdT;6A1_2H&YNJY zWjptc!iO_Ip9lsn*?K00S8Tr7t%b8s_~?Die)H+9MZjxIXDbgG<9PNDUNe|W+E|~u zBsXgJ^30vJtVMm%Lf3D>b;}Al&i=4n7OVG0AUmP6^-z&^yWl+2_xjOl$L{UaQ{CLR zaoUI4JvXv89?YDzxmRa>)w1bRfAQ~Bldzs%uy$$Le71)F4F8WXs0c7HF)=YSFflVQ zgZ;q3$i%?RA}A!RsAR}0VkDq!{QnjM2O}c`BP-M5cl(#idGnv1v;E1Pn#ymbhPQkC zpVmx`D2X`6W|8MD;bfC~XRWhs_pt!87f1BvLlb^KQr+6QZPVG`p)GRCHD7$>V?=JwD3&!7|abCbg3+tw}5SugLCewO<8r`PT>k)7rYJGXtFVGy}MFZ0HS zh-YG%XP1886f*T)(v`$JH?OWXXnAbDf+vv6G4AnyhHdvn3*vY6&Ag!I%b>^cpF!$Q z)YCfO&e}z*wB;ho4c`2%u4b6K+9)?RX`aIER|mhOo6XdzTHX71%fikz?*CrO$?yMv zgh5dd6mX0z&`<+~9V3$C)E8KXMW!(J?&FuP;X#x0M|{9V+( zEpYnxKsifG?Jw1u?D79E`y> z2r04{3M(jqEnos!ASu);zf?k~F(qVr%5-s;t^bcOs0%PKGBdKXFf)QpW&q_#CP71H0U-rN14m({z(S+M#))7{ z7#Y~?neIsYWvtkfcHsV_UjIjjJ|tYqThf)2b)BJiHV^X}7rn)?SGIiR?AuauGVpxs zM|3d_)OO^9b+DA>MW%1eB2yXNj#l^Ty^?p% hy~ipTc)Dc2&-?OA-278)iZ_P}pS?ew)3W~mO#mCRfgS(= literal 0 HcmV?d00001 diff --git a/test/data/peacock.progressive.scan005.jpeg b/test/data/peacock.progressive.scan005.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..327591938636e42114eb45252bc9cecfcd30cc7e GIT binary patch literal 1418 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 literal 0 HcmV?d00001 diff --git a/test/data/peacock.progressive.scan008.jpeg b/test/data/peacock.progressive.scan008.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..83ea7ac8c73b38b494bc0d67adc913806aa1b2c4 GIT binary patch literal 1670 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