Commit 528bbdde authored by Sam Hocevar's avatar Sam Hocevar Committed by Diego Biurrun

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
parent 96f2c1fb
...@@ -44,9 +44,9 @@ b466c970d54eb254ad0f954b08535634 *./data/b-libav.dv ...@@ -44,9 +44,9 @@ b466c970d54eb254ad0f954b08535634 *./data/b-libav.dv
2906382 ./data/b-libav.gif 2906382 ./data/b-libav.gif
b977a4fedff90a79baf70c8e02986820 *./data/b-libav.y4m b977a4fedff90a79baf70c8e02986820 *./data/b-libav.y4m
3801810 ./data/b-libav.y4m 3801810 ./data/b-libav.y4m
./data/b-libav%d.pgm CRC=84c09106 ./data/b-libav%02d.pgm CRC=84c09106
./data/b-libav%d.ppm CRC=25c06ecf ./data/b-libav%02d.ppm CRC=25c06ecf
./data/b-libav%d.jpg CRC=62328baa ./data/b-libav%02d.jpg CRC=62328baa
b0a8c8063d81921db5d7c8f50a1cc454 *./data/b-libav.wav b0a8c8063d81921db5d7c8f50a1cc454 *./data/b-libav.wav
89132 ./data/b-libav.wav 89132 ./data/b-libav.wav
./data/b-libav.wav CRC=2a09519c ./data/b-libav.wav CRC=2a09519c
......
...@@ -86,7 +86,7 @@ ffmpeg="../ffmpeg_g" ...@@ -86,7 +86,7 @@ ffmpeg="../ffmpeg_g"
tiny_psnr="./tiny_psnr" tiny_psnr="./tiny_psnr"
reffile="$2" reffile="$2"
benchfile="$datadir/ffmpeg.bench" benchfile="$datadir/ffmpeg.bench"
raw_src="$3/%d.pgm" raw_src="$3/%02d.pgm"
raw_dst="$datadir/out.yuv" raw_dst="$datadir/out.yuv"
raw_ref="$datadir/ref.yuv" raw_ref="$datadir/ref.yuv"
pcm_src="asynth1.sw" pcm_src="asynth1.sw"
...@@ -640,17 +640,17 @@ do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src $file ...@@ -640,17 +640,17 @@ do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src $file
#################### ####################
# image formats # image formats
# pgm (we do not do md5 on image files yet) # 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 $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $file
do_ffmpeg_crc $file -i $file do_ffmpeg_crc $file -i $file
# ppm (we do not do md5 on image files yet) # 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 $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $file
do_ffmpeg_crc $file -i $file do_ffmpeg_crc $file -i $file
# jpeg (we do not do md5 on image files yet) # 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 $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 do_ffmpeg_crc $file -f image2 -i $file
......
...@@ -279,7 +279,7 @@ int main(int argc, char **argv) ...@@ -279,7 +279,7 @@ int main(int argc, char **argv)
init_demo(argv[2]); init_demo(argv[2]);
for(i=0;i<DEFAULT_NB_PICT;i++) { 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); gen_image(i, w, h);
pgmyuv_save(buf, w, h, rgb_tab); pgmyuv_save(buf, w, h, rgb_tab);
} }
......
...@@ -57,7 +57,7 @@ FileMaxSize 100M ...@@ -57,7 +57,7 @@ FileMaxSize 100M
# Fire up ffmpeg pointing at this stream # 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 acl allow localhost
</Feed> </Feed>
......
...@@ -268,7 +268,7 @@ int main(int argc, char **argv) ...@@ -268,7 +268,7 @@ int main(int argc, char **argv)
height = h; height = h;
for(i=0;i<DEFAULT_NB_PICT;i++) { 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); gen_image(i, w, h);
pgmyuv_save(buf, w, h, rgb_tab); pgmyuv_save(buf, w, h, rgb_tab);
} }
......
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