Add slice-based parallel H.264 decoding

[ffmpeg] / tests / regression.sh

diff --git a/tests/regression.sh b/tests/regression.sh
index 69b50b1a3e9537e0360976e33e891576a336f2ac..7580e866f4f7e00bc7b473989b77667ad6152ab9 100755 (executable)
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -19,7 +19,7 @@ fi
 
 set -e
 
-datadir="./data"
+datadir="./tests/data"
 
 logfile="$datadir/ffmpeg.regression"
 outfile="$datadir/a-"
@@ -87,12 +87,13 @@ else
     do_adpcm_yam=y
     do_dv=y
     do_dv50=y
+    do_flashsv=y
 fi
 
 
 # various files
-ffmpeg="../ffmpeg_g"
-tiny_psnr="./tiny_psnr"
+ffmpeg="./ffmpeg_g"
+tiny_psnr="tests/tiny_psnr"
 reffile="$2"
 benchfile="$datadir/ffmpeg.bench"
 bench="$datadir/bench.tmp"
@@ -100,7 +101,7 @@ bench2="$datadir/bench2.tmp"
 raw_src="$3/%02d.pgm"
 raw_dst="$datadir/out.yuv"
 raw_ref="$datadir/ref.yuv"
-pcm_src="asynth1.sw"
+pcm_src="tests/asynth1.sw"
 pcm_dst="$datadir/out.wav"
 pcm_ref="$datadir/ref.wav"
 if [ X"`echo | md5sum 2> /dev/null`" != X ]; then
@@ -218,9 +219,9 @@ do_streamed_images()
 do_image_formats()
 {
     file=${outfile}libav%02d.$1
-    $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $2 $3 $file
+    $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $2 $3 -flags +bitexact $file
     do_ffmpeg_crc $file $3 -i $file
-
+    do_md5sum ${outfile}libav02.$1 >> $logfile
 }
 
 do_audio_only()
@@ -512,6 +513,13 @@ do_video_encoding svq1.mov "" pgmyuv "-an -vcodec svq1 -qscale 3 -pix_fmt yuv410
 do_video_decoding "" "-pix_fmt yuv420p"
 fi
 
+###################################
+if [ -n "$do_flashsv" ] ; then
+# svq1
+do_video_encoding flashsv.flv "" pgmyuv "-an -vcodec flashsv "
+do_video_decoding "" "-pix_fmt yuv420p"
+fi
+
 ###################################
 if [ -n "$do_mp2" ] ; then
 # mp2
@@ -577,7 +585,7 @@ fi
 ###################################
 #if [ -n "$do_vorbis" ] ; then
 # vorbis
-#disabled because its broken
+#disabled because it is broken
 #do_audio_encoding vorbis.asf "-ar 44100" "-acodec vorbis"
 #do_audio_decoding
 #fi
@@ -627,6 +635,13 @@ do_libav dv "-ar 48000 -r 25 -s pal -ac 2"
 # gxf
 do_libav gxf "-ar 48000 -r 25 -s pal -ac 1"
 
+# nut
+do_libav nut "-acodec mp2"
+
+# mkv
+do_libav mkv
+
+
 ####################
 # streamed images
 # mjpeg
@@ -655,13 +670,25 @@ 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)
+# pgm
 do_image_formats pgm
 
-# ppm (we do not do md5 on image files yet)
+# ppm
 do_image_formats ppm
 
-# jpeg (we do not do md5 on image files yet)
+# bmp
+do_image_formats bmp
+
+# tga
+do_image_formats tga
+
+# tiff
+do_image_formats tiff "-pix_fmt rgb24"
+
+# sgi
+do_image_formats sgi
+
+# jpeg
 do_image_formats jpg "-flags +bitexact -dct fastint -idct simple -pix_fmt yuvj420p" "-f image2"
 
 ####################
@@ -692,7 +719,7 @@ do_audio_only voc
 # pix_fmt conversions
 conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
              yuvj422p yuvj444p rgb24 bgr24 rgb32 rgb565 rgb555 gray monow \
-             monob pal8"
+             monob pal8 yuv440p yuvj440p"
 for pix_fmt in $conversions ; do
     file=${outfile}libav-${pix_fmt}.yuv
     do_ffmpeg_nocheck $file -r 1 -t 1 -y -f pgmyuv -i $raw_src \