aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSam Hocevar <sam+ffmpeg@zoy.org>2005-09-21 00:09:02 +0000
committerDiego Biurrun <diego@biurrun.de>2005-09-21 00:09:02 +0000
commit528bbdde7f1cb7512cdab7b0fb78dc5da37cef0c (patch)
tree83ac43f4f143e2a8e7c14c9b2d7e1e2c2c0e8d6e /tests
parent96f2c1fbce594d0dca8c41cb2d7de8d24ec67ebe (diff)
downloadffmpeg-528bbdde7f1cb7512cdab7b0fb78dc5da37cef0c.tar.gz
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 > Originally committed as revision 4606 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
-rw-r--r--tests/libav.regression.ref6
-rwxr-xr-xtests/regression.sh8
-rw-r--r--tests/rotozoom.c2
-rw-r--r--tests/test.conf2
-rw-r--r--tests/videogen.c2
5 files changed, 10 insertions, 10 deletions
diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index 2fed4e6e88..b473daecc5 100644
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -44,9 +44,9 @@ b466c970d54eb254ad0f954b08535634 *./data/b-libav.dv
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
diff --git a/tests/regression.sh b/tests/regression.sh
index dd0997dd62..98b982a3b8 100755
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -86,7 +86,7 @@ ffmpeg="../ffmpeg_g"
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 @@ do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src $file
####################
# 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
diff --git a/tests/rotozoom.c b/tests/rotozoom.c
index adbd0ae054..bad32995f3 100644
--- a/tests/rotozoom.c
+++ b/tests/rotozoom.c
@@ -279,7 +279,7 @@ int main(int argc, char **argv)
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);
}
diff --git a/tests/test.conf b/tests/test.conf
index e57d524821..84e014c9fc 100644
--- a/tests/test.conf
+++ b/tests/test.conf
@@ -57,7 +57,7 @@ FileMaxSize 100M
# 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>
diff --git a/tests/videogen.c b/tests/videogen.c
index 0a7924301b..626dd0672c 100644
--- a/tests/videogen.c
+++ b/tests/videogen.c
@@ -268,7 +268,7 @@ int main(int argc, char **argv)
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);
}