Commit 3e3c638e authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Switch regression tests to swscale.

Plain C, x86-32 and -64 have been tested and should work, other
archs that had asm optmizations in swscale likely will need some fixes
to either fall back on C if SWS_BITEXACT is set or make the asm match C.
This also disables the PAL8 test as neither swscale nor the old scaler
really support PAL8 output, imgconvert supported a fixed 666 palette
as output and swscale supports fixed 884 and 422.

Originally committed as revision 15305 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f433c8ab
......@@ -263,11 +263,11 @@ LAVF_REG = tests/data/lavf.regression
ROTOZOOM_REG = tests/data/rotozoom.regression
VSYNTH_REG = tests/data/vsynth.regression
ifeq ($(CONFIG_SWSCALE),yes)
ifneq ($(CONFIG_SWSCALE),yes)
servertest codectest $(CODEC_TESTS) libavtest: swscale_error
swscale_error:
@echo
@echo "This regression test is incompatible with --enable-swscale."
@echo "This regression test requires --enable-swscale."
@echo
@exit 1
endif
......
......@@ -10,10 +10,10 @@ stddev: 7.68 PSNR: 30.41 bytes: 7603200/ 7603200
787469 ./tests/data/a-mpeg2ivlc-qprd.mpg
985170ca0ab1ec1edbb37c44d8cfde90 *./tests/data/mpeg2.vsynth.out.yuv
stddev: 10.09 PSNR: 28.04 bytes: 7603200/ 7603200
b1cfb7a3b2f1f6794dd6b9efec9cc558 *./tests/data/a-mpeg2_422.mpg
738682 ./tests/data/a-mpeg2_422.mpg
bf65179abc21dfbe1ca035ce86977579 *./tests/data/mpeg2.vsynth.out.yuv
stddev: 63.37 PSNR: 12.08 bytes: 10137600/ 7603200
06c7ec28f90541cb056a62046805a2c7 *./tests/data/a-mpeg2_422.mpg
687928 ./tests/data/a-mpeg2_422.mpg
3116eb7a4549c884be9378ccdf164fe2 *./tests/data/mpeg2.vsynth.out.yuv
stddev: 63.29 PSNR: 12.09 bytes: 10137600/ 7603200
2566ea5760247a9485c8281cb52291a8 *./tests/data/a-mpeg2.mpg
735853 ./tests/data/a-mpeg2.mpg
55c22a09e4924977ee2cc4180078d3ae *./tests/data/mpeg2.vsynth.out.yuv
......@@ -106,18 +106,18 @@ stddev: 7.02 PSNR: 31.18 bytes: 7603200/ 7603200
1026429 ./tests/data/a-mpeg1b.mpg
dd9a471c6b2d1004a90e42f34707becf *./tests/data/mpeg1b.vsynth.out.yuv
stddev: 6.34 PSNR: 32.07 bytes: 7603200/ 7603200
2f9cb2ede35f7d12f6b518c50e20d81c *./tests/data/a-mjpeg.avi
1567580 ./tests/data/a-mjpeg.avi
18c3a76f984e717dd886d21fa04355f6 *./tests/data/mjpeg.vsynth.out.yuv
stddev: 7.93 PSNR: 30.13 bytes: 7603200/ 7603200
092af2505ab4799e38399058f72269dd *./tests/data/a-mjpeg.avi
1568766 ./tests/data/a-mjpeg.avi
68131a07d3c078d1460a88a955a4d260 *./tests/data/mjpeg.vsynth.out.yuv
stddev: 7.92 PSNR: 30.14 bytes: 7603200/ 7603200
7c79e97bbe4b2eac12a4bef0568eeb93 *./tests/data/a-ljpeg.avi
6312866 ./tests/data/a-ljpeg.avi
799d3db687f6cdd7a837ec156efc171f *./tests/data/ljpeg.vsynth.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
dca9d700da7857217408c310c501b9bc *./tests/data/a-jpegls.avi
9086676 ./tests/data/a-jpegls.avi
0f8637e9b861230aff9894825af83720 *./tests/data/jpegls.vsynth.out.yuv
stddev: 2.84 PSNR: 39.04 bytes: 7603200/ 7603200
07fb88b0a025523ed699c62308e9dd33 *./tests/data/a-jpegls.avi
9086168 ./tests/data/a-jpegls.avi
012717e7c928641410eaa6abaf126fdc *./tests/data/jpegls.vsynth.out.yuv
stddev: 2.84 PSNR: 39.05 bytes: 7603200/ 7603200
99ef24bf57718fd29a7a91b22af2b3fe *./tests/data/a-rv10.rm
667935 ./tests/data/a-rv10.rm
d507be4253a9c8211a3738c58ba28118 *./tests/data/rv10.vsynth.out.yuv
......@@ -142,34 +142,34 @@ f8f51fa737add17f7fecaefa118b57ed *./tests/data/a-ffv1.avi
2654678 ./tests/data/a-ffv1.avi
799d3db687f6cdd7a837ec156efc171f *./tests/data/ffv1.vsynth.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
5b3430252fdbbc7de5ffedc36150b0bf *./tests/data/a-snow.avi
156726 ./tests/data/a-snow.avi
3de2b39f90fd8331f27e627e68e076f7 *./tests/data/snow.vsynth.out.yuv
stddev: 23.15 PSNR: 20.83 bytes: 7603200/ 7603200
0686abe923285feb8b2ba0de5e6f304a *./tests/data/a-snow.avi
137018 ./tests/data/a-snow.avi
3a00e0016a28f4b759c2e9df8cd3db02 *./tests/data/snow.vsynth.out.yuv
stddev: 22.73 PSNR: 20.99 bytes: 7603200/ 7603200
c7397d2ceb420f7564dcc785948bff84 *./tests/data/a-snow53.avi
3520692 ./tests/data/a-snow53.avi
799d3db687f6cdd7a837ec156efc171f *./tests/data/snowll.vsynth.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
c299f64c3e85b928c5bfe71629cee006 *./tests/data/a-dv.dv
9bfab037b2779eef4b95773788bbe369 *./tests/data/a-dv.dv
7200000 ./tests/data/a-dv.dv
3b9ead854b912e43ead976e4e86aab3b *./tests/data/dv.vsynth.out.yuv
stddev: 8.91 PSNR: 29.12 bytes: 7603200/ 7603200
f3f2d89bbf40b5812c919b7bdf38684b *./tests/data/a-dv411.dv
eed5e51bbb178e0a54853f1b9878b841 *./tests/data/dv.vsynth.out.yuv
stddev: 6.90 PSNR: 31.34 bytes: 7603200/ 7603200
d601c05c2c2bc7153ba687dadb2ef51c *./tests/data/a-dv411.dv
7200000 ./tests/data/a-dv411.dv
b59e4ad3f4eef415752641d087c75d5d *./tests/data/dv.vsynth.out.yuv
stddev: 30.72 PSNR: 18.37 bytes: 7603200/ 7603200
70dc9a58345e603094dedcac71e2dcd2 *./tests/data/a-dv50.dv
fce469df997d2c5f749cb2b2d0f360da *./tests/data/dv.vsynth.out.yuv
stddev: 30.77 PSNR: 18.36 bytes: 7603200/ 7603200
fb282f03a0481cc9625baed0f927d978 *./tests/data/a-dv50.dv
14400000 ./tests/data/a-dv50.dv
d727da8c7ce387ebe68845a1be916ee3 *./tests/data/dv50.vsynth.out.yuv
stddev: 8.50 PSNR: 29.52 bytes: 7603200/ 7603200
95d08d714679c0f1a96b6da353c64660 *./tests/data/a-svq1.mov
1365783 ./tests/data/a-svq1.mov
fb0a97094a89d6f379535f615783d00c *./tests/data/svq1.vsynth.out.yuv
stddev: 10.98 PSNR: 27.30 bytes: 7603200/ 7603200
7f1f97c37bfff641d0f137f9774c0112 *./tests/data/a-flashsv.flv
14685499 ./tests/data/a-flashsv.flv
0f8637e9b861230aff9894825af83720 *./tests/data/flashsv.vsynth.out.yuv
stddev: 2.84 PSNR: 39.04 bytes: 7603200/ 7603200
8d6afc3a0243f44510fd5f1b1719248a *./tests/data/dv50.vsynth.out.yuv
stddev: 1.72 PSNR: 43.36 bytes: 7603200/ 7603200
303aad8cf148645c9b8659670e6c2de0 *./tests/data/a-svq1.mov
1359751 ./tests/data/a-svq1.mov
5bbd40268e94bdfb430abf57caa0c291 *./tests/data/svq1.vsynth.out.yuv
stddev: 9.53 PSNR: 28.53 bytes: 7603200/ 7603200
d6f92d41d739f95cc63ef8e6453c5011 *./tests/data/a-flashsv.flv
14684984 ./tests/data/a-flashsv.flv
012717e7c928641410eaa6abaf126fdc *./tests/data/flashsv.vsynth.out.yuv
stddev: 2.84 PSNR: 39.05 bytes: 7603200/ 7603200
21f8ff9f1daacd9133683bb4ea0f50a4 *./tests/data/a-mp2.mp2
95712 ./tests/data/a-mp2.mp2
83f8df5d5f84480566af548bb037fceb *./tests/data/mp2.vsynth.out.wav
......
......@@ -24,52 +24,52 @@ f8ad5bd78f4d012a8ce9570aa395ac54 *./tests/data/b-libav.flv
af78858062599fcbba049e4a02588a15 *./tests/data/b-libav.mov
366879 ./tests/data/b-libav.mov
./tests/data/b-libav.mov CRC=0x45079dca
7820fa85ab86c62028d8dbda94589573 *./tests/data/b-libav.dv
913b6199765b1dcba196706574621c2f *./tests/data/b-libav.dv
3600000 ./tests/data/b-libav.dv
./tests/data/b-libav.dv CRC=0xf517e829
2ba41cf880aa5cb87e8a08fdb735398d *./tests/data/b-libav.gxf
814640 ./tests/data/b-libav.gxf
./tests/data/b-libav.gxf CRC=0xa376c09e
./tests/data/b-libav.dv CRC=0x7787e173
8a6452b105db3e112fb041a98eda7ea5 *./tests/data/b-libav.gxf
805992 ./tests/data/b-libav.gxf
./tests/data/b-libav.gxf CRC=0x9c06676e
66a6584f9e83e8ea3af822a3ba71fbbe *./tests/data/b-libav.nut
329264 ./tests/data/b-libav.nut
./tests/data/b-libav.nut CRC=0x400c29e9
f108c91e3adadb39ce436c8836793045 *./tests/data/b-libav.mkv
329860 ./tests/data/b-libav.mkv
./tests/data/b-libav.mkv CRC=0x400c29e9
9a9da315747599f7718cc9a9a09c21ff *./tests/data/b-pbmpipe.pbm
af195c31e8f49de61e3851ccde4c3ebd *./tests/data/b-pbmpipe.pbm
317075 ./tests/data/b-pbmpipe.pbm
./tests/data/b-pbmpipe.pbm CRC=0xb92906cb
6ea0e1faf08f6fcdb44db4a104361b57 *./tests/data/b-pgmpipe.pgm
./tests/data/b-pbmpipe.pbm CRC=0x1ac46c70
aff140ce80a1c86c1bf54118ad23da7b *./tests/data/b-pgmpipe.pgm
2534775 ./tests/data/b-pgmpipe.pgm
./tests/data/b-pgmpipe.pgm CRC=0xf4aa7c47
0c5fe86621b7377705837f304d4ba1e9 *./tests/data/b-ppmpipe.ppm
./tests/data/b-pgmpipe.pgm CRC=0xf485870f
94939357f0cb9502c474e3b017bd745a *./tests/data/b-ppmpipe.ppm
7603575 ./tests/data/b-ppmpipe.ppm
./tests/data/b-ppmpipe.ppm CRC=0xb2bb8e92
88a98269295fbfce7816558ad84e1259 *./tests/data/b-libav.gif
./tests/data/b-ppmpipe.ppm CRC=0x80b9c1bc
b1450712a8dbb81602320d59e40ec3db *./tests/data/b-libav.gif
2906382 ./tests/data/b-libav.gif
b977a4fedff90a79baf70c8e02986820 *./tests/data/b-libav.y4m
3801810 ./tests/data/b-libav.y4m
de216b43403f51e57e644fbf812568bf *./tests/data/b-libav02.pgm
./tests/data/b-libav%02d.pgm CRC=0x84c09106
0a6d74b54396884f117669965b57d3b5 *./tests/data/b-libav02.pgm
./tests/data/b-libav%02d.pgm CRC=0x7e552eb1
101391 ./tests/data/b-libav02.pgm
86bbdb77afa289ff363120f8044f29df *./tests/data/b-libav02.ppm
./tests/data/b-libav%02d.ppm CRC=0x25c06ecf
eb5b4ff1352f952234164ca15bd9d9e8 *./tests/data/b-libav02.ppm
./tests/data/b-libav%02d.ppm CRC=0x13da003d
304143 ./tests/data/b-libav02.ppm
c3a9f333ddebff6eae3f4360bad2de29 *./tests/data/b-libav02.bmp
./tests/data/b-libav%02d.bmp CRC=0xf3a66ecf
419701a0c5b87283176a3cdd648649a7 *./tests/data/b-libav02.bmp
./tests/data/b-libav%02d.bmp CRC=0x34f4003d
304182 ./tests/data/b-libav02.bmp
f558eef0740c4b247f1eb17e1dbf7adf *./tests/data/b-libav02.tga
./tests/data/b-libav%02d.tga CRC=0xf3a66ecf
714379cd2d4dc43b63d7b51c4d60df06 *./tests/data/b-libav02.tga
./tests/data/b-libav%02d.tga CRC=0x34f4003d
304172 ./tests/data/b-libav02.tga
7211a09803f104e59196bc712a819e69 *./tests/data/b-libav02.tiff
./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.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
668be47e39d3b293b36ee4a19650888f *./tests/data/b-libav02.tiff
./tests/data/b-libav%02d.tiff CRC=0x13da003d
307140 ./tests/data/b-libav02.tiff
af9d42ee21fa256dc5ec6b45f0b57f19 *./tests/data/b-libav02.sgi
./tests/data/b-libav%02d.sgi CRC=0x13da003d
307753 ./tests/data/b-libav02.sgi
8dd3739ea6778335f57fb3e2a28c6453 *./tests/data/b-libav02.jpg
./tests/data/b-libav%02d.jpg CRC=0x2e3e4535
31586 ./tests/data/b-libav02.jpg
b0a8c8063d81921db5d7c8f50a1cc454 *./tests/data/b-libav.wav
89132 ./tests/data/b-libav.wav
./tests/data/b-libav.wav CRC=0x2a09519c
......@@ -94,43 +94,41 @@ ae3a23a7ea13c92a2909445ca8144dcd *./tests/data/b-libav.aif
9268c90bd2623a5ab3c2a1a751826f69 *./tests/data/b-libav.ogg
14210 ./tests/data/b-libav.ogg
./tests/data/b-libav.ogg CRC=0x37a143ea
ce356ce2708cb6033ab5d762da93cfd4 *./tests/data/b-libav-yuv420p.yuv
52bb2f530036c657edc512965258d735 *./tests/data/b-libav-yuv420p.yuv
304128 ./tests/data/b-libav-yuv420p.yuv
ce356ce2708cb6033ab5d762da93cfd4 *./tests/data/b-libav-yuv422p.yuv
345bf1aff3fa9eba908bb8ebef284346 *./tests/data/b-libav-yuv422p.yuv
304128 ./tests/data/b-libav-yuv422p.yuv
ce356ce2708cb6033ab5d762da93cfd4 *./tests/data/b-libav-yuv444p.yuv
52bb2f530036c657edc512965258d735 *./tests/data/b-libav-yuv444p.yuv
304128 ./tests/data/b-libav-yuv444p.yuv
ce356ce2708cb6033ab5d762da93cfd4 *./tests/data/b-libav-yuyv422.yuv
345bf1aff3fa9eba908bb8ebef284346 *./tests/data/b-libav-yuyv422.yuv
304128 ./tests/data/b-libav-yuyv422.yuv
545f61c353a8b4419808785cb4f0069d *./tests/data/b-libav-yuv410p.yuv
e2d4633215bc12b933eb733cfbd9c022 *./tests/data/b-libav-yuv410p.yuv
304128 ./tests/data/b-libav-yuv410p.yuv
d6c03f930018ff859bd43f52b92e9321 *./tests/data/b-libav-yuv411p.yuv
692c12328dce2b5785bd658425660296 *./tests/data/b-libav-yuv411p.yuv
304128 ./tests/data/b-libav-yuv411p.yuv
14117c4d7956775a7bbceabfc38da808 *./tests/data/b-libav-yuvj420p.yuv
a0b0e086c800ee0b590c2f85bbff5e79 *./tests/data/b-libav-yuvj420p.yuv
304128 ./tests/data/b-libav-yuvj420p.yuv
14117c4d7956775a7bbceabfc38da808 *./tests/data/b-libav-yuvj422p.yuv
b365c84c3d3f3a9d6d3a7f942ac68e79 *./tests/data/b-libav-yuvj422p.yuv
304128 ./tests/data/b-libav-yuvj422p.yuv
14117c4d7956775a7bbceabfc38da808 *./tests/data/b-libav-yuvj444p.yuv
a79eea1bb595f8ede8dad2c82346ce6a *./tests/data/b-libav-yuvj444p.yuv
304128 ./tests/data/b-libav-yuvj444p.yuv
deb2f7ebe297df2c1fe264d19b34d2fb *./tests/data/b-libav-rgb24.yuv
20dc18820fb75d5b3c446aae2f3ebf5a *./tests/data/b-libav-rgb24.yuv
304128 ./tests/data/b-libav-rgb24.yuv
deb2f7ebe297df2c1fe264d19b34d2fb *./tests/data/b-libav-bgr24.yuv
20dc18820fb75d5b3c446aae2f3ebf5a *./tests/data/b-libav-bgr24.yuv
304128 ./tests/data/b-libav-bgr24.yuv
deb2f7ebe297df2c1fe264d19b34d2fb *./tests/data/b-libav-rgb32.yuv
20dc18820fb75d5b3c446aae2f3ebf5a *./tests/data/b-libav-rgb32.yuv
304128 ./tests/data/b-libav-rgb32.yuv
5d395f62bff8ac475f743268c772ca3a *./tests/data/b-libav-rgb565.yuv
8e84e5fb320e57e2e137ba8608394a47 *./tests/data/b-libav-rgb565.yuv
304128 ./tests/data/b-libav-rgb565.yuv
2ffd6871fcbfe9570454e8703ac8ea01 *./tests/data/b-libav-rgb555.yuv
9b74239ec2e35e70c669a2a6ad550f8c *./tests/data/b-libav-rgb555.yuv
304128 ./tests/data/b-libav-rgb555.yuv
0b62dcf9b57b294dbaa5d9e99b1ee192 *./tests/data/b-libav-gray.yuv
838958bb95a41057a18bbb647c39ba87 *./tests/data/b-libav-gray.yuv
304128 ./tests/data/b-libav-gray.yuv
e197450dae2feba9e757b551e1e9145c *./tests/data/b-libav-monow.yuv
924f069f4c9ad5beeb7e56f6b701b1a5 *./tests/data/b-libav-monow.yuv
304128 ./tests/data/b-libav-monow.yuv
e197450dae2feba9e757b551e1e9145c *./tests/data/b-libav-monob.yuv
924f069f4c9ad5beeb7e56f6b701b1a5 *./tests/data/b-libav-monob.yuv
304128 ./tests/data/b-libav-monob.yuv
7a319375916cae4e691ecb74295e5d2a *./tests/data/b-libav-pal8.yuv
304128 ./tests/data/b-libav-pal8.yuv
ce356ce2708cb6033ab5d762da93cfd4 *./tests/data/b-libav-yuv440p.yuv
ac2c17f1a27d928e8b82f21dbafdd715 *./tests/data/b-libav-yuv440p.yuv
304128 ./tests/data/b-libav-yuv440p.yuv
14117c4d7956775a7bbceabfc38da808 *./tests/data/b-libav-yuvj440p.yuv
10c8507ad38d0ce5e8cd0f1dd49b0d26 *./tests/data/b-libav-yuvj440p.yuv
304128 ./tests/data/b-libav-yuvj440p.yuv
......@@ -41,7 +41,7 @@ fi
# create the data directory if it does not exist
mkdir -p $datadir
FFMPEG_OPTS="-y -flags +bitexact -dct fastint -idct simple"
FFMPEG_OPTS="-y -flags +bitexact -dct fastint -idct simple -sws_flags +accurate_rnd+bitexact"
do_ffmpeg()
{
......@@ -146,7 +146,7 @@ do_streamed_images()
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
$ffmpeg -t 0.5 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src $2 $3 -flags +bitexact -sws_flags +accurate_rnd+bitexact $file
do_md5sum ${outfile}libav02.$1 >> $logfile
do_ffmpeg_crc $file $3 -i $file
wc -c ${outfile}libav02.$1 >> $logfile
......@@ -252,8 +252,8 @@ do_video_decoding
fi
if [ -n "$do_huffyuv" ] ; then
do_video_encoding huffyuv.avi "" "-an -vcodec huffyuv -pix_fmt yuv422p"
do_video_decoding "" "-strict -2 -pix_fmt yuv420p"
do_video_encoding huffyuv.avi "" "-an -vcodec huffyuv -pix_fmt yuv422p -sws_flags neighbor+bitexact"
do_video_decoding "" "-strict -2 -pix_fmt yuv420p -sws_flags neighbor+bitexact"
fi
if [ -n "$do_rc" ] ; then
......@@ -306,8 +306,8 @@ do_video_decoding
fi
if [ -n "$do_jpegls" ] ; then
do_video_encoding jpegls.avi "" "-an -vcodec jpegls -vtag MJPG"
do_video_decoding "" "-pix_fmt yuv420p"
do_video_encoding jpegls.avi "" "-an -vcodec jpegls -vtag MJPG -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact"
do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+bitexact"
fi
if [ -n "$do_rv10" ] ; then
......@@ -354,13 +354,13 @@ if [ -n "$do_dv" ] ; then
do_video_encoding dv.dv "-dct int" "-s pal -an"
do_video_decoding "" "-s cif"
do_video_encoding dv411.dv "-dct int" "-s pal -an -pix_fmt yuv411p"
do_video_decoding "" "-s cif"
do_video_encoding dv411.dv "-dct int" "-s pal -an -pix_fmt yuv411p -sws_flags area+accurate_rnd+bitexact"
do_video_decoding "" "-s cif -sws_flags area+accurate_rnd+bitexact"
fi
if [ -n "$do_dv50" ] ; then
do_video_encoding dv50.dv "-dct int" "-s pal -pix_fmt yuv422p -an"
do_video_decoding "" "-s cif -pix_fmt yuv420p"
do_video_encoding dv50.dv "-dct int" "-s pal -pix_fmt yuv422p -an -sws_flags neighbor+bitexact"
do_video_decoding "" "-s cif -pix_fmt yuv420p -sws_flags neighbor+bitexact"
fi
if [ -n "$do_svq1" ] ; then
......@@ -369,8 +369,8 @@ do_video_decoding "" "-pix_fmt yuv420p"
fi
if [ -n "$do_flashsv" ] ; then
do_video_encoding flashsv.flv "" "-an -vcodec flashsv "
do_video_decoding "" "-pix_fmt yuv420p"
do_video_encoding flashsv.flv "" "-an -vcodec flashsv -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact"
do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact"
fi
if [ -n "$do_mp2" ] ; then
......@@ -624,7 +624,7 @@ fi
if [ -n "$do_pixfmt" ] ; then
conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
yuvj422p yuvj444p rgb24 bgr24 rgb32 rgb565 rgb555 gray monow \
monob pal8 yuv440p yuvj440p"
monob yuv440p yuvj440p"
for pix_fmt in $conversions ; do
file=${outfile}libav-${pix_fmt}.yuv
do_ffmpeg_nocheck $file -r 1 -t 1 -f image2 -vcodec pgmyuv -i $raw_src \
......
......@@ -10,9 +10,9 @@ stddev: 4.96 PSNR: 34.19 bytes: 7603200/ 7603200
247161 ./tests/data/a-mpeg2ivlc-qprd.mpg
cc6f08c1a24b58c19de325e79cfa40a3 *./tests/data/mpeg2.rotozoom.out.yuv
stddev: 4.25 PSNR: 35.55 bytes: 7603200/ 7603200
6f49b4c7941d0f559c2efeeb46d7914b *./tests/data/a-mpeg2_422.mpg
358018 ./tests/data/a-mpeg2_422.mpg
da03fae3a0e2d23dbb415bd5005376c3 *./tests/data/mpeg2.rotozoom.out.yuv
a144ff5d9b293b43fc13ec40119925c0 *./tests/data/a-mpeg2_422.mpg
359045 ./tests/data/a-mpeg2_422.mpg
5e7a85daf29ae185499cacab2b39c17f *./tests/data/mpeg2.rotozoom.out.yuv
stddev: 54.55 PSNR: 13.38 bytes: 10137600/ 7603200
f979bcca866e6e4cad5dc6cb06e56cfb *./tests/data/a-mpeg2.mpg
198041 ./tests/data/a-mpeg2.mpg
......@@ -106,18 +106,18 @@ stddev: 4.73 PSNR: 34.62 bytes: 7603200/ 7603200
229806 ./tests/data/a-mpeg1b.mpg
f41c60846bfb8cb6dcf6071c846c82b4 *./tests/data/mpeg1b.rotozoom.out.yuv
stddev: 4.13 PSNR: 35.79 bytes: 7603200/ 7603200
b179402bba391073b5f5f9324a834061 *./tests/data/a-mjpeg.avi
703564 ./tests/data/a-mjpeg.avi
b1aa72cfb6f9cc3f525b27abc86a8f51 *./tests/data/mjpeg.rotozoom.out.yuv
765b2637f313eda33afdcdc384bfbc06 *./tests/data/a-mjpeg.avi
704100 ./tests/data/a-mjpeg.avi
3dc419bf8ddc7482d811e4c9dcf9d418 *./tests/data/mjpeg.rotozoom.out.yuv
stddev: 4.38 PSNR: 35.28 bytes: 7603200/ 7603200
554a4a6a5a9058c588f8bf2de405bc70 *./tests/data/a-ljpeg.avi
4766914 ./tests/data/a-ljpeg.avi
dde5895817ad9d219f79a52d0bdfb001 *./tests/data/ljpeg.rotozoom.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
f67cd488dfd06c03ad1d6d94d81b80c8 *./tests/data/a-jpegls.avi
8334488 ./tests/data/a-jpegls.avi
a63d4e3ea1f0b0c0d44821da9e09b8f4 *./tests/data/jpegls.rotozoom.out.yuv
stddev: 0.67 PSNR: 51.57 bytes: 7603200/ 7603200
4fc53937f048c900ae6d50fda9dba206 *./tests/data/a-jpegls.avi
8334630 ./tests/data/a-jpegls.avi
592b3321994e26a990deb3a0a1415de9 *./tests/data/jpegls.rotozoom.out.yuv
stddev: 0.65 PSNR: 51.83 bytes: 7603200/ 7603200
989a42671603dc1a7e6b156dccf0e820 *./tests/data/a-rv10.rm
154330 ./tests/data/a-rv10.rm
61213b91b359697ebcefb9e0a53ac54a *./tests/data/rv10.rotozoom.out.yuv
......@@ -142,34 +142,34 @@ d72b0960e162d4998b9acbabb07e99ab *./tests/data/a-ffv1.avi
3525804 ./tests/data/a-ffv1.avi
dde5895817ad9d219f79a52d0bdfb001 *./tests/data/ffv1.rotozoom.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
0b404d5372a5c6c93f6087614020b096 *./tests/data/a-snow.avi
69068 ./tests/data/a-snow.avi
63ea1d2fe1693be57d3ab7d351af7c55 *./tests/data/snow.rotozoom.out.yuv
stddev: 10.87 PSNR: 27.39 bytes: 7603200/ 7603200
af651d8ef0a66257ac8b2ef8b229f27b *./tests/data/a-snow.avi
57700 ./tests/data/a-snow.avi
8890189af71a0dd3447c4e8424c9a76b *./tests/data/snow.rotozoom.out.yuv
stddev: 10.47 PSNR: 27.71 bytes: 7603200/ 7603200
a8fccf278bbb17d37a756ecf11672b09 *./tests/data/a-snow53.avi
2721758 ./tests/data/a-snow53.avi
dde5895817ad9d219f79a52d0bdfb001 *./tests/data/snowll.rotozoom.out.yuv
stddev: 0.00 PSNR:999.99 bytes: 7603200/ 7603200
54cdeaee32d1007666a1e487e739daf6 *./tests/data/a-dv.dv
02c85b9bebb23f147ef598da7bcbf736 *./tests/data/a-dv.dv
7200000 ./tests/data/a-dv.dv
75bf724e37f667f36af50e2051846574 *./tests/data/dv.rotozoom.out.yuv
stddev: 3.11 PSNR: 38.24 bytes: 7603200/ 7603200
a8f9aaab0220c8895dafa43ebcda916d *./tests/data/a-dv411.dv
7ec62bd3350a6848364669e6e1e4b9cc *./tests/data/dv.rotozoom.out.yuv
stddev: 1.71 PSNR: 43.46 bytes: 7603200/ 7603200
203e50e75a43fb1b26e1b53d99e1de4f *./tests/data/a-dv411.dv
7200000 ./tests/data/a-dv411.dv
06ab34615153162ad73696672531d448 *./tests/data/dv.rotozoom.out.yuv
stddev: 10.17 PSNR: 27.97 bytes: 7603200/ 7603200
ac6741e4c79e9ed18f179c4124ede29c *./tests/data/a-dv50.dv
7f9fa421028aabb11eaf4c6513a5a843 *./tests/data/dv.rotozoom.out.yuv
stddev: 10.09 PSNR: 28.04 bytes: 7603200/ 7603200
2bae05531a24cd6764eefba64db345bc *./tests/data/a-dv50.dv
14400000 ./tests/data/a-dv50.dv
ad9907f4ef608f025f5fc38b4b067b37 *./tests/data/dv50.rotozoom.out.yuv
stddev: 3.11 PSNR: 38.25 bytes: 7603200/ 7603200
c15016c75394199660ae405c5d396e28 *./tests/data/a-svq1.mov
768399 ./tests/data/a-svq1.mov
6bc10518bc387c3bdf117997713ee69a *./tests/data/svq1.rotozoom.out.yuv
stddev: 3.44 PSNR: 37.39 bytes: 7603200/ 7603200
e0b42dde0cc71c294664da94721395ac *./tests/data/a-flashsv.flv
12368839 ./tests/data/a-flashsv.flv
a63d4e3ea1f0b0c0d44821da9e09b8f4 *./tests/data/flashsv.rotozoom.out.yuv
stddev: 0.67 PSNR: 51.57 bytes: 7603200/ 7603200
af3f2dd5ab62c1a1d98b07d4aeb6852f *./tests/data/dv50.rotozoom.out.yuv
stddev: 0.82 PSNR: 49.81 bytes: 7603200/ 7603200
7f9fbe4890bc1df67867bf03803dca48 *./tests/data/a-svq1.mov
766851 ./tests/data/a-svq1.mov
aa03471dac3f49455a33a2b19fda1098 *./tests/data/svq1.rotozoom.out.yuv
stddev: 3.23 PSNR: 37.92 bytes: 7603200/ 7603200
2b93b46800f531ac088702e313d96c5f *./tests/data/a-flashsv.flv
12368953 ./tests/data/a-flashsv.flv
592b3321994e26a990deb3a0a1415de9 *./tests/data/flashsv.rotozoom.out.yuv
stddev: 0.65 PSNR: 51.83 bytes: 7603200/ 7603200
21f8ff9f1daacd9133683bb4ea0f50a4 *./tests/data/a-mp2.mp2
95712 ./tests/data/a-mp2.mp2
83f8df5d5f84480566af548bb037fceb *./tests/data/mp2.rotozoom.out.wav
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment