From 3a71577f87fd9486d4eeddb0fc747452839eb4e1 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sun, 30 Mar 2008 21:29:38 +0000 Subject: [PATCH] homogenous regression tests output for image formats Originally committed as revision 12639 to svn://svn.ffmpeg.org/ffmpeg/trunk --- tests/libav.regression.ref | 21 ++++++++++++++------- tests/regression.sh | 3 ++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index 2f9c052110..20fad3f9d3 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -49,20 +49,27 @@ f108c91e3adadb39ce436c8836793045 *./tests/data/b-libav.mkv 2906382 ./tests/data/b-libav.gif b977a4fedff90a79baf70c8e02986820 *./tests/data/b-libav.y4m 3801810 ./tests/data/b-libav.y4m -./tests/data/b-libav%02d.pgm CRC=0x84c09106 de216b43403f51e57e644fbf812568bf *./tests/data/b-libav02.pgm -./tests/data/b-libav%02d.ppm CRC=0x25c06ecf +./tests/data/b-libav%02d.pgm CRC=0x84c09106 +101391 ./tests/data/b-libav02.pgm 86bbdb77afa289ff363120f8044f29df *./tests/data/b-libav02.ppm -./tests/data/b-libav%02d.bmp CRC=0xf3a66ecf +./tests/data/b-libav%02d.ppm CRC=0x25c06ecf +304143 ./tests/data/b-libav02.ppm c3a9f333ddebff6eae3f4360bad2de29 *./tests/data/b-libav02.bmp -./tests/data/b-libav%02d.tga CRC=0xf3a66ecf +./tests/data/b-libav%02d.bmp CRC=0xf3a66ecf +304182 ./tests/data/b-libav02.bmp f558eef0740c4b247f1eb17e1dbf7adf *./tests/data/b-libav02.tga -./tests/data/b-libav%02d.tiff CRC=0x25c06ecf +./tests/data/b-libav%02d.tga CRC=0xf3a66ecf +304172 ./tests/data/b-libav02.tga 7211a09803f104e59196bc712a819e69 *./tests/data/b-libav02.tiff -./tests/data/b-libav%02d.sgi CRC=0x25c06ecf +./tests/data/b-libav%02d.tiff CRC=0x25c06ecf +307091 ./tests/data/b-libav02.tiff 50a1d8ca27813084e20b7ae0b8f9d663 *./tests/data/b-libav02.sgi -./tests/data/b-libav%02d.jpg CRC=0x62328baa +./tests/data/b-libav%02d.sgi CRC=0x25c06ecf +306282 ./tests/data/b-libav02.sgi 5d6c53e5297c4485e26c25e37885376f *./tests/data/b-libav02.jpg +./tests/data/b-libav%02d.jpg CRC=0x62328baa +31609 ./tests/data/b-libav02.jpg b0a8c8063d81921db5d7c8f50a1cc454 *./tests/data/b-libav.wav 89132 ./tests/data/b-libav.wav ./tests/data/b-libav.wav CRC=0x2a09519c diff --git a/tests/regression.sh b/tests/regression.sh index 34cbf5c569..ba894545da 100755 --- a/tests/regression.sh +++ b/tests/regression.sh @@ -148,8 +148,9 @@ do_image_formats() { file=${outfile}libav%02d.$1 $ffmpeg -t 0.5 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src $2 $3 -flags +bitexact $file - do_ffmpeg_crc $file $3 -i $file do_md5sum ${outfile}libav02.$1 >> $logfile + do_ffmpeg_crc $file $3 -i $file + wc -c ${outfile}libav02.$1 >> $logfile } do_audio_only()