mirror of
https://github.com/libjpeg-turbo/libjpeg-turbo.git
synced 2026-01-18 21:41:20 +01:00
TurboJPEG: Add restart markers when transforming
This commit is contained in:
DRC
@@ -139,25 +139,29 @@ ENTROPYARG=${ENTROPYARG//-arithmetic/-a}
|
||||
LOSSLSARG=${LOSSLSARG//-lossless/-l}
|
||||
|
||||
XFORMNAME=(hflip vflip transpose transverse rot90 rot180 rot270)
|
||||
XFORMARGS=("-f h" "-f v" -t -transv "-ro 90" "-ro 180" "-ro 270")
|
||||
XFORMARGS=("-f h -r 2" "-f v" "-t -r 1b" -transv "-ro 90 -r 1" "-ro 180" "-ro 270")
|
||||
|
||||
# Standard tests
|
||||
for image in $IMAGES; do
|
||||
|
||||
cp $IMGDIR/$image $OUTDIR
|
||||
basename=`basename $image .${EXT}`
|
||||
r1barg=
|
||||
if [ "$LOSSLSARG" != "-l" ]; then
|
||||
r1barg="-r 1b"
|
||||
fi
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc fa $ENTROPYARG $LOSSLSARG $LOSSLSPSV -gr -outf $OUTDIR/${basename}_GRAY_fast_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc fa $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 1x4 -outf $OUTDIR/${basename}_441_fast_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc fa $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 4x1 -outf $OUTDIR/${basename}_411_fast_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc fa $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 1x4 -r 2 -outf $OUTDIR/${basename}_441_fast_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc fa $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 4x1 -r 1 -outf $OUTDIR/${basename}_411_fast_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc fa $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 2x2 -outf $OUTDIR/${basename}_420_fast_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc fa $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 1x2 -outf $OUTDIR/${basename}_440_fast_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc fa $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 1x2 $r1barg -outf $OUTDIR/${basename}_440_fast_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc fa $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 2x1 -outf $OUTDIR/${basename}_422_fast_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc fa $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 1x1 -outf $OUTDIR/${basename}_444_fast_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc i $ENTROPYARG $LOSSLSARG $LOSSLSPSV -gr -outf $OUTDIR/${basename}_GRAY_accurate_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc i $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 1x4 -outf $OUTDIR/${basename}_441_accurate_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc i $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 4x1 -outf $OUTDIR/${basename}_411_accurate_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc i $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 1x4 -r 2 -outf $OUTDIR/${basename}_441_accurate_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc i $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 4x1 -r 1 -outf $OUTDIR/${basename}_411_accurate_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc i $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 2x2 -outf $OUTDIR/${basename}_420_accurate_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc i $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 1x2 -outf $OUTDIR/${basename}_440_accurate_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc i $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 1x2 $r1barg -outf $OUTDIR/${basename}_440_accurate_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc i $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 2x1 -outf $OUTDIR/${basename}_422_accurate_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
runme $EXEDIR/cjpeg -q 95 -pre $PRECISION -dc i $ENTROPYARG $LOSSLSARG $LOSSLSPSV -sa 1x1 -outf $OUTDIR/${basename}_444_accurate_cjpeg.jpg $IMGDIR/${basename}.${EXT}
|
||||
for samp in $ALLSUBSAMP; do
|
||||
@@ -177,9 +181,9 @@ for image in $IMAGES; do
|
||||
fi
|
||||
runme $TJBENCH $OUTDIR/$image $TJQUAL -pre $PRECISION -rgb -q -be 0.01 -w 0 ${dctarg} $YUVARG $ALLOCARG $ENTROPYARG $LOSSLSARG
|
||||
if [ "$LOSSLSARG" != "-l" ]; then
|
||||
runme $TJBENCH $OUTDIR/$image $TJQUAL -pre $PRECISION -su 440 -rgb -q -be 0.01 -w 0 ${dctarg} $YUVARG $ALLOCARG $ENTROPYARG $LOSSLSARG
|
||||
runme $TJBENCH $OUTDIR/$image $TJQUAL -pre $PRECISION -su 411 -rgb -q -be 0.01 -w 0 ${dctarg} $YUVARG $ALLOCARG $ENTROPYARG $LOSSLSARG
|
||||
runme $TJBENCH $OUTDIR/$image $TJQUAL -pre $PRECISION -su 441 -rgb -q -be 0.01 -w 0 ${dctarg} $YUVARG $ALLOCARG $ENTROPYARG $LOSSLSARG
|
||||
runme $TJBENCH $OUTDIR/$image $TJQUAL -pre $PRECISION -su 440 -r 1b -rgb -q -be 0.01 -w 0 ${dctarg} $YUVARG $ALLOCARG $ENTROPYARG $LOSSLSARG
|
||||
runme $TJBENCH $OUTDIR/$image $TJQUAL -pre $PRECISION -su 411 -r 1 -rgb -q -be 0.01 -w 0 ${dctarg} $YUVARG $ALLOCARG $ENTROPYARG $LOSSLSARG
|
||||
runme $TJBENCH $OUTDIR/$image $TJQUAL -pre $PRECISION -su 441 -r 2 -rgb -q -be 0.01 -w 0 ${dctarg} $YUVARG $ALLOCARG $ENTROPYARG $LOSSLSARG
|
||||
fi
|
||||
for samp in $ALLSUBSAMP; do
|
||||
if [ "$LOSSLSARG" = "-l" ]; then
|
||||
|
||||
@@ -70,6 +70,8 @@ for precision in 8 12; do
|
||||
EXTRA_ARGS=-a
|
||||
elif [ $sampi = 3 ]; then
|
||||
EXTRA_ARGS=-o
|
||||
elif [ $sampi = 5 ]; then
|
||||
EXTRA_ARGS="-r 1"
|
||||
fi
|
||||
runme $EXEDIR/cjpeg -pre $precision -sa ${SAMPOPT[$sampi]} $EXTRA_ARGS \
|
||||
-outf $OUTDIR/`basename $RGBIMG .ppm`-${SUBSAMPOPT[$sampi]}.jpg $RGBIMG
|
||||
@@ -120,31 +122,36 @@ for precision in 8 12; do
|
||||
if [[ "$progarg" = "-p" && "$optarg" = "-o" ]]; then
|
||||
continue
|
||||
fi
|
||||
for trimarg in "" "-tri"; do
|
||||
if [ "$trimarg" = "-tri" ]; then
|
||||
if [[ "$xformarg" = "-t" || "$xformarg" = "" ]]; then
|
||||
continue
|
||||
fi
|
||||
if [ "$croparg" != "" ]; then
|
||||
continue
|
||||
fi
|
||||
for restartarg in "" "-r 1" "-r 1b"; do
|
||||
if [[ "$restartarg" = "-r 1b" && "$croparg" != "" ]]; then
|
||||
continue
|
||||
fi
|
||||
runme $TJTRAN $ariarg $copyarg $croparg $xformarg \
|
||||
$grayarg $optarg $progarg $trimarg \
|
||||
$OUTDIR/${basename}-$subsamp.jpg \
|
||||
$OUTDIR/${basename}-tjtran.jpg
|
||||
runme $EXEDIR/jpegtran $ariarg $copyarg $croparg \
|
||||
$xformarg $grayarg $optarg $progarg $trimarg \
|
||||
-outf $OUTDIR/${basename}-jpegtran.jpg \
|
||||
$OUTDIR/${basename}-$subsamp.jpg
|
||||
$EXEDIR/test/md5sum $OUTDIR/${basename}-tjtran.jpg \
|
||||
$OUTDIR/${basename}-jpegtran.jpg |
|
||||
sed "s@$OUTDIR@\$OUTDIR@g"
|
||||
cmp $OUTDIR/${basename}-tjtran.jpg \
|
||||
$OUTDIR/${basename}-jpegtran.jpg
|
||||
rm $OUTDIR/${basename}-tjtran.jpg \
|
||||
$OUTDIR/${basename}-jpegtran.jpg
|
||||
echo
|
||||
for trimarg in "" "-tri"; do
|
||||
if [ "$trimarg" = "-tri" ]; then
|
||||
if [[ "$xformarg" = "-t" || "$xformarg" = "" ]]; then
|
||||
continue
|
||||
fi
|
||||
if [ "$croparg" != "" ]; then
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
runme $TJTRAN $ariarg $copyarg $croparg $xformarg \
|
||||
$grayarg $optarg $progarg $restartarg $trimarg \
|
||||
$OUTDIR/${basename}-$subsamp.jpg \
|
||||
$OUTDIR/${basename}-tjtran.jpg
|
||||
runme $EXEDIR/jpegtran $ariarg $copyarg $croparg \
|
||||
$xformarg $grayarg $optarg $progarg $restartarg \
|
||||
$trimarg -outf $OUTDIR/${basename}-jpegtran.jpg \
|
||||
$OUTDIR/${basename}-$subsamp.jpg
|
||||
$EXEDIR/test/md5sum $OUTDIR/${basename}-tjtran.jpg \
|
||||
$OUTDIR/${basename}-jpegtran.jpg |
|
||||
sed "s@$OUTDIR@\$OUTDIR@g"
|
||||
cmp $OUTDIR/${basename}-tjtran.jpg \
|
||||
$OUTDIR/${basename}-jpegtran.jpg
|
||||
rm $OUTDIR/${basename}-tjtran.jpg \
|
||||
$OUTDIR/${basename}-jpegtran.jpg
|
||||
echo
|
||||
done
|
||||
done
|
||||
done
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user