From d0c30ca54e3a3f5be09c0e77ba58050ec8a44dba Mon Sep 17 00:00:00 2001 From: Fabrice Bellard Date: Sat, 25 May 2002 22:47:17 +0000 Subject: reactivated swf/mjpeg/jpg formats testing Originally committed as revision 600 to svn://svn.ffmpeg.org/ffmpeg/trunk --- tests/Makefile | 2 +- tests/dsptest.c | 24 +++++++++++------------- tests/libav.regression.ref | 13 +++++++++---- tests/regression.sh | 16 +++++++++------- 4 files changed, 30 insertions(+), 25 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index f5198d7040..610084a69b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,6 +1,6 @@ # # Makefile for tests -# (c) 2002 Gerard Lantau +# (c) 2002 Fabrice Bellard # include ../config.mak diff --git a/tests/dsptest.c b/tests/dsptest.c index 125d105edb..09a22ff4f2 100644 --- a/tests/dsptest.c +++ b/tests/dsptest.c @@ -1,23 +1,21 @@ /* * MMX optimized DSP utils - * Copyright (c) 2000, 2001 Gerard Lantau. + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #define TESTCPU_MAIN #include "dsputil.h" //#include "../libavcodec/dsputil.c" diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index 656a4f976c..4b1cf2ab47 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -6,15 +6,20 @@ ef90f12bc797e5e5a1b861842337ea07 /tmp/a-libav.avi 4508a1cbbe65a42e7da42b680b8ef7e5 /tmp/a-libav.rm e5956eba346efaf8d485c8e595672f15 /tmp/a-libav.mpg /tmp/a-libav.mpg CRC=917d4442 -bb02e59ef519ef72bcfcfc0265ac2965 /tmp/a-libav.ffm -7a03394d82a1437a45143768b7544116 /tmp/a-libav.mjpeg +48a0f69d9dd53cac1b3881d1d05568f0 /tmp/a-libav.swf +/tmp/a-libav.swf CRC=f81e4afd +310f44e654eef2d1991828684990ceb0 /tmp/a-libav.ffm +/tmp/a-libav.ffm CRC=2c9e3e17 +5db97638cbb4d8ac95cbd6cbe4db22b5 /tmp/a-libav.mjpeg +/tmp/a-libav.mjpeg CRC=394c0818 aff140ce80a1c86c1bf54118ad23da7b /tmp/a-libav.pgmpipe /tmp/a-libav.pgmpipe CRC=50151823 5f50d148d57d25a900a071a5c471df9e /tmp/a-libav.ppmpipe /tmp/a-libav.ppmpipe CRC=12f0c2c6 5f50d148d57d25a900a071a5c471df9e /tmp/a-libav.gif -/tmp/a-libav%d.pgm CRC=50151823 -/tmp/a-libav%d.ppm CRC=b24e0c74 +/tmp/a-libav%d.pgm CRC=07f57a1a +/tmp/a-libav%d.ppm CRC=3261ce73 +/tmp/a-libav%d.jpg CRC=b41cd20e 8854ea97f2d2172383941b001c69228b /tmp/a-libav.wav /tmp/a-libav.wav CRC=f1ae5536 8bce9c3758b0d38da2e0718b6ab57fb4 /tmp/a-libav.al diff --git a/tests/regression.sh b/tests/regression.sh index a3e2c41c7c..a1cd1a3e5f 100755 --- a/tests/regression.sh +++ b/tests/regression.sh @@ -175,15 +175,13 @@ do_ffmpeg_crc $file -i $file # swf (decode audio only) file=${outfile}libav.swf -# broken -#do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file -#do_ffmpeg_crc $file -i $file +do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file +do_ffmpeg_crc $file -i $file # ffm file=${outfile}libav.ffm do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file -# broken -#do_ffmpeg_crc $file -i $file +do_ffmpeg_crc $file -i $file # XXX: need mov and mpegts tests (add bitstreams or add output capability in ffmpeg) @@ -192,8 +190,7 @@ do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $f # mjpeg file=${outfile}libav.mjpeg do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src $file -# broken -#do_ffmpeg_crc $file -i $file +do_ffmpeg_crc $file -i $file # pgmpipe file=${outfile}libav.pgmpipe @@ -222,6 +219,11 @@ file=${outfile}libav%d.ppm $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $file do_ffmpeg_crc $file -i $file +# jpeg (we do not do md5 on image files yet) +file=${outfile}libav%d.jpg +$ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $file +do_ffmpeg_crc $file -i $file + #################### # audio only -- cgit v1.2.3