Merge branch 'main' into dev

This commit is contained in:
DRC
2024-09-04 08:38:13 -04:00
23 changed files with 51 additions and 61 deletions

View File

@@ -20,7 +20,7 @@ runme()
}
EXT=bmp
IMAGES="vgl_5674_0098.${EXT} vgl_6434_0018a.${EXT} vgl_6548_0026a.${EXT} big_tree8.${EXT}"
IMAGES="vgl_5674_0098.${EXT} vgl_6434_0018a.${EXT} vgl_6548_0026a.${EXT} shira_bird8.${EXT}"
IMGDIR=@CMAKE_SOURCE_DIR@/testimages
OUTDIR=`mktemp -d /tmp/__tjbenchtest_output.XXXXXX`
EXEDIR=@CMAKE_BINARY_DIR@
@@ -64,12 +64,12 @@ while [ $# -gt 0 ]; do
# each downsampled dimension is an odd number or is evenly divisible by the MCU
# width/height. This disagreement basically amounts to a round-off error, but
# there is no easy way around it, so for now, we just test the only image that
# works. (NOTE: big_tree8 does not suffer from the above issue, but it suffers
# from an unrelated problem whereby the combination of tj3DecompressToYUV*()
# and tj3DecodeYUV*() do not produce bitwise-identical results to
# tj3Decompress*() if decompression scaling is enabled. This latter phenomenon
# is not yet fully understood but is also believed to be some sort of round-off
# error.)
# works. (NOTE: shira_bird8 does not suffer from the above issue, but it
# suffers from an unrelated problem whereby the combination of
# tj3DecompressToYUV*() and tj3DecodeYUV*() do not produce bitwise-identical
# results to tj3Decompress*() if decompression scaling is enabled. This latter
# phenomenon is not yet fully understood but is also believed to be some sort
# of round-off error.)
IMAGES="vgl_6548_0026a.${EXT}"
;;
-alloc)
@@ -110,7 +110,7 @@ while [ $# -gt 0 ]; do
PRECISION=$1
if [ $PRECISION != 8 ]; then
EXT=ppm
IMAGES="big_building16.${EXT}"
IMAGES="monkey16.${EXT}"
BMPARG=
fi
;;
@@ -125,7 +125,7 @@ if [ $PRECISION = 8 -a "$YUVARG" = "" ]; then
IMAGES="vgl_6548_0026a.${EXT}"
elif [ "$ENTROPYARG" = "-arithmetic" -o \
"$ENTROPYARG" = "-progressive-arithmetic" ]; then
IMAGES="big_tree8.${EXT}"
IMAGES="shira_bird8.${EXT}"
fi
fi

View File

@@ -58,8 +58,8 @@ for precision in 8 12; do
RGBIMG=$IMGDIR/testorig.ppm
GRAYIMG=$IMGDIR/testorig.pgm
else
RGBIMG=$IMGDIR/big_building16.ppm
GRAYIMG=$IMGDIR/big_building16.pgm
RGBIMG=$IMGDIR/monkey16.ppm
GRAYIMG=$IMGDIR/monkey16.pgm
fi
for restartarg in "" "-r 1" "-r 1b"; do
for ariarg in "" "-a"; do
@@ -151,8 +151,8 @@ for precision in {2..16}; do
RGBIMG=$IMGDIR/testorig.ppm
GRAYIMG=$IMGDIR/testorig.pgm
else
RGBIMG=$IMGDIR/big_building16.ppm
GRAYIMG=$IMGDIR/big_building16.pgm
RGBIMG=$IMGDIR/monkey16.ppm
GRAYIMG=$IMGDIR/monkey16.pgm
fi
for psv in {1..7}; do
for pt in {0..15}; do

View File

@@ -58,8 +58,8 @@ for precision in 8 12; do
RGBIMG=$IMGDIR/testorig.ppm
GRAYIMG=$IMGDIR/testorig.pgm
else
RGBIMG=$IMGDIR/big_building16.ppm
GRAYIMG=$IMGDIR/big_building16.pgm
RGBIMG=$IMGDIR/monkey16.ppm
GRAYIMG=$IMGDIR/monkey16.pgm
fi
for sampi in {0..6}; do
@@ -166,8 +166,8 @@ for precision in {2..16}; do
RGBIMG=$IMGDIR/testorig.ppm
GRAYIMG=$IMGDIR/testorig.pgm
else
RGBIMG=$IMGDIR/big_building16.ppm
GRAYIMG=$IMGDIR/big_building16.pgm
RGBIMG=$IMGDIR/monkey16.ppm
GRAYIMG=$IMGDIR/monkey16.pgm
fi
basename=`basename $RGBIMG .ppm`

View File

@@ -58,8 +58,8 @@ for precision in 8 12; do
RGBIMG=$IMGDIR/testorig.ppm
GRAYIMG=$IMGDIR/testorig.pgm
else
RGBIMG=$IMGDIR/big_building16.ppm
GRAYIMG=$IMGDIR/big_building16.pgm
RGBIMG=$IMGDIR/monkey16.ppm
GRAYIMG=$IMGDIR/monkey16.pgm
fi
for sampi in {0..6}; do