std/jpeg: implement block smoothing

"script/confirm-matches-djpeg.sh test/data/*.jpeg" is now all matches.

name                                             old speed      new speed      delta

wuffs_jpeg_decode_19k_8bpp/clang11                369MB/s ± 0%   366MB/s ± 0%   -0.79%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_progressive/clang11   335MB/s ± 0%   302MB/s ± 0%   -9.93%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_sequential/clang11   1.01GB/s ± 0%  1.00GB/s ± 0%   -1.07%  (p=0.008 n=5+5)
wuffs_jpeg_decode_77k_24bpp/clang11               829MB/s ± 0%   820MB/s ± 0%   -1.03%  (p=0.008 n=5+5)
wuffs_jpeg_decode_552k_24bpp_420/clang11          903MB/s ± 0%   895MB/s ± 0%   -0.93%  (p=0.008 n=5+5)
wuffs_jpeg_decode_552k_24bpp_444/clang11         1.12GB/s ± 0%  1.11GB/s ± 0%   -1.28%  (p=0.008 n=5+5)
wuffs_jpeg_decode_4002k_24bpp/clang11             906MB/s ± 0%   897MB/s ± 0%   -0.93%  (p=0.008 n=5+5)

wuffs_jpeg_decode_19k_8bpp/gcc10                  350MB/s ± 0%   370MB/s ± 0%   +5.54%  (p=0.016 n=4+5)
wuffs_jpeg_decode_30k_24bpp_progressive/gcc10     334MB/s ± 0%   309MB/s ± 0%   -7.46%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_sequential/gcc10      924MB/s ± 0%   948MB/s ± 0%   +2.61%  (p=0.008 n=5+5)
wuffs_jpeg_decode_77k_24bpp/gcc10                 745MB/s ± 0%   769MB/s ± 0%   +3.25%  (p=0.008 n=5+5)
wuffs_jpeg_decode_552k_24bpp_420/gcc10            813MB/s ± 0%   841MB/s ± 0%   +3.41%  (p=0.029 n=4+4)
wuffs_jpeg_decode_552k_24bpp_444/gcc10           1.00GB/s ± 0%  1.00GB/s ± 0%   +0.25%  (p=0.029 n=4+4)
wuffs_jpeg_decode_4002k_24bpp/gcc10               821MB/s ± 0%   846MB/s ± 0%   +3.00%  (p=0.008 n=5+5)
This commit is contained in:
Nigel Tao committed 2023-08-19 17:16:51 +10:00
1 parent d60bfb05e8
commit 41d0c095c8
5 files changed
+1749 -35

No files matched your search

+23 -3
View File
@@ -19,6 +19,8 @@
# libjpeg-turbo) produce the same output (using djpeg's default configuration,
# with no further command line arguments).
DJPEG_BINARY=${DJPEG_BINARY:-djpeg}
if [ ! -e wuffs-root-directory.txt ]; then
echo "$0 should be run from the Wuffs root directory."
exit 1
@@ -28,8 +30,26 @@ elif [ ! -e gen/bin/example-convert-to-nia ]; then
elif [ ! -e gen/bin/example-crc32 ]; then
echo "Run \"./build-example.sh example/crc32\" first."
exit 1
elif [ -z $(which djpeg) ]; then
echo "Could not find \"djpeg\"."
elif [ -z $(which $DJPEG_BINARY) ]; then
echo "Could not find DJPEG_BINARY \"$DJPEG_BINARY\"."
exit 1
elif [[ ! $($DJPEG_BINARY -version 2>&1 >/dev/null) =~ ^libjpeg ]]; then
echo "Could not get libjpeg version from DJPEG_BINARY \"$DJPEG_BINARY\"."
exit 1
fi
djpeg_version=$($DJPEG_BINARY -version 2>&1 >/dev/null)
if [[ $djpeg_version =~ ^libjpeg.*version.2\.0 ||
$djpeg_version =~ ^libjpeg.*version.2\.1 ||
$djpeg_version =~ ^libjpeg.*version.3\.0\.0 ]]; then
# "Wuffs's std/jpeg matches djpeg" needs these libjpeg-turbo commits:
# - 6d91e950 Use 5x5 win & 9 AC coeffs when smoothing DC scans (in 2.1.0)
# - dbae5928 Fix interblock smoothing with narrow prog. JPEGs (in 3.0.1)
# - 9b704f96 Fix block smoothing w/vert.-subsampled prog. JPEGs (in 3.0.1)
# https://github.com/libjpeg-turbo/libjpeg-turbo/commit/6d91e950c871103a11bac2f10c63bf998796c719
# https://github.com/libjpeg-turbo/libjpeg-turbo/commit/dbae59281fdc6b3a6304a40134e8576d50d662c0
# https://github.com/libjpeg-turbo/libjpeg-turbo/commit/9b704f96b2dccc54363ad7a2fe8e378fc1a2893b
echo "\"$djpeg_version\" too old from DJPEG_BINARY \"$DJPEG_BINARY\"."
exit 1
fi
@@ -44,7 +64,7 @@ result=0
handle() {
local have=$(gen/bin/example-convert-to-nia -output-netpbm <$1 2>/dev/null | gen/bin/example-crc32)
local want=$(djpeg $1 2>/dev/null | gen/bin/example-crc32)
local want=$($DJPEG_BINARY $1 2>/dev/null | gen/bin/example-crc32)
if [ "$want" != "00000000" ]; then
if [ "$want" == "$have" ]; then
echo "Match $1"