[Ffmpeg-cvslog] CVS: ffmpeg/tests libav.regression.ref, 1.75, 1.76 regression.sh, 1.82, 1.83 rotozoom.c, 1.5, 1.6 test.conf, 1.7, 1.8 videogen.c, 1.4, 1.5

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg/tests
In directory mail:/var2/tmp/cvs-serv28938

Modified Files:
	libav.regression.ref regression.sh rotozoom.c test.conf 
	videogen.c 
Log Message:
Add a leading zero to the sequence files generated by the testsuite
so they always appear in proper order.
patch by Sam Hocevar < sam -- at -- zoy -- dot -- org >


Index: libav.regression.ref
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/libav.regression.ref,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- libav.regression.ref	12 Sep 2005 10:23:52 -0000	1.75
+++ libav.regression.ref	21 Sep 2005 00:09:02 -0000	1.76
@@ -44,9 +44,9 @@
 2906382 ./data/b-libav.gif
 b977a4fedff90a79baf70c8e02986820 *./data/b-libav.y4m
 3801810 ./data/b-libav.y4m
-./data/b-libav%d.pgm CRC=84c09106
-./data/b-libav%d.ppm CRC=25c06ecf
-./data/b-libav%d.jpg CRC=62328baa
+./data/b-libav%02d.pgm CRC=84c09106
+./data/b-libav%02d.ppm CRC=25c06ecf
+./data/b-libav%02d.jpg CRC=62328baa
 b0a8c8063d81921db5d7c8f50a1cc454 *./data/b-libav.wav
 89132 ./data/b-libav.wav
 ./data/b-libav.wav CRC=2a09519c

Index: regression.sh
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/regression.sh,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- regression.sh	12 Sep 2005 19:16:07 -0000	1.82
+++ regression.sh	21 Sep 2005 00:09:02 -0000	1.83
@@ -86,7 +86,7 @@
 tiny_psnr="./tiny_psnr"
 reffile="$2"
 benchfile="$datadir/ffmpeg.bench"
-raw_src="$3/%d.pgm"
+raw_src="$3/%02d.pgm"
 raw_dst="$datadir/out.yuv"
 raw_ref="$datadir/ref.yuv"
 pcm_src="asynth1.sw"
@@ -640,17 +640,17 @@
 ####################
 # image formats
 # pgm (we do not do md5 on image files yet)
-file=${outfile}libav%d.pgm
+file=${outfile}libav%02d.pgm
 $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $file
 do_ffmpeg_crc $file -i $file
 
 # ppm (we do not do md5 on image files yet)
-file=${outfile}libav%d.ppm
+file=${outfile}libav%02d.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
+file=${outfile}libav%02d.jpg
 $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src -flags +bitexact -dct fastint -idct simple -pix_fmt yuvj420p -f image2 $file
 do_ffmpeg_crc $file -f image2 -i $file
 

Index: rotozoom.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/rotozoom.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rotozoom.c	24 Dec 2004 12:34:11 -0000	1.5
+++ rotozoom.c	21 Sep 2005 00:09:02 -0000	1.6
@@ -279,7 +279,7 @@
     init_demo(argv[2]);
 
     for(i=0;i<DEFAULT_NB_PICT;i++) {
-        snprintf(buf, sizeof(buf), "%s%d.pgm", argv[1], i);
+        snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[1], i);
         gen_image(i, w, h);
         pgmyuv_save(buf, w, h, rgb_tab);
     }

Index: test.conf
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/test.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- test.conf	18 Jul 2005 09:02:58 -0000	1.7
+++ test.conf	21 Sep 2005 00:09:02 -0000	1.8
@@ -57,7 +57,7 @@
 
 # Fire up ffmpeg pointing at this stream
 
-Launch -loop -bitexact -dct_algo 1 -idct_algo 2 -y -f pgmyuv -i vsynth1/%d.pgm
+Launch -loop -bitexact -dct_algo 1 -idct_algo 2 -y -f pgmyuv -i vsynth1/%02d.pgm
 acl allow localhost
 </Feed>
 

Index: videogen.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/videogen.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- videogen.c	15 Oct 2003 01:22:50 -0000	1.4
+++ videogen.c	21 Sep 2005 00:09:02 -0000	1.5
@@ -268,7 +268,7 @@
     height = h;
 
     for(i=0;i<DEFAULT_NB_PICT;i++) {
-        snprintf(buf, sizeof(buf), "%s%d.pgm", argv[1], i);
+        snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[1], i);
         gen_image(i, w, h);
         pgmyuv_save(buf, w, h, rgb_tab);
     }