Add libswresample.

[ffmpeg] / tests / fate-run.sh

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 6739fd9eaa65bd8913d153c9b78b8543a32c8e02..a09c13ab47ce544e4e781042c4746dc5a791d276 100755 (executable)
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -1,5 +1,7 @@
 #! /bin/sh
 
+export LC_ALL=C
+
 base=$(dirname $0)
 . "${base}/md5.sh"
 
@@ -13,6 +15,9 @@ command=$5
 cmp=${6:-diff}
 ref=${7:-"${base}/ref/fate/${test}"}
 fuzz=$8
+threads=${9:-1}
+thread_type=${10:-frame+slice}
+tool=${11}
 
 outdir="tests/data/fate"
 outfile="${outdir}/${test}"
@@ -25,7 +30,7 @@ do_tiny_psnr(){
     val=$(expr "$psnr" : ".*$3: *\([0-9.]*\)")
     size1=$(expr "$psnr" : '.*bytes: *\([0-9]*\)')
     size2=$(expr "$psnr" : '.*bytes:[ 0-9]*/ *\([0-9]*\)')
-    res=$(echo "$val $4 $5" | bc)
+    res=$(echo "if ($val $4 $5) 1" | bc)
     if [ "$res" != 1 ] || [ $size1 != $size2 ]; then
         echo "$psnr"
         return 1
@@ -40,37 +45,39 @@ stddev(){
     do_tiny_psnr "$1" "$2" stddev  '<=' ${fuzz:-1}
 }
 
-ffmpeg(){
-    $target_exec $target_path/ffmpeg "$@"
+run(){
+    test "${V:-0}" -gt 0 && echo "$target_exec" $target_path/"$@" >&3
+    $target_exec $target_path/"$@"
+}
+
+avconv(){
+    run $tool -v 0 -threads $threads -thread_type $thread_type "$@"
 }
 
 framecrc(){
-    ffmpeg "$@" -f framecrc -
+    avconv "$@" -f framecrc -
 }
 
 framemd5(){
-    ffmpeg "$@" -f framemd5 -
+    avconv "$@" -f framemd5 -
 }
 
 crc(){
-    ffmpeg "$@" -f crc -
+    avconv "$@" -f crc -
 }
 
 md5(){
-    ffmpeg "$@" md5:
+    avconv "$@" md5:
 }
 
 pcm(){
-    ffmpeg "$@" -vn -f s16le -
+    avconv "$@" -vn -f s16le -
 }
 
 regtest(){
     t="${test#$2-}"
     ref=${base}/ref/$2/$t
-    cleanfiles="$cleanfiles $outfile $errfile"
-    outfile=tests/data/regression/$2/$t
-    errfile=tests/data/$t.$2.err
-    ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path"
+    ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$tool"
 }
 
 codectest(){
@@ -98,17 +105,18 @@ seektest(){
                  file=$(echo tests/data/$d/$file)
                  ;;
     esac
-    $target_exec $target_path/tests/seek_test $target_path/$file
+    $target_exec $target_path/libavformat/seek-test $target_path/$file
 }
 
 mkdir -p "$outdir"
 
+exec 3>&2
 $command > "$outfile" 2>$errfile
 err=$?
 
 if [ $err -gt 128 ]; then
     sig=$(kill -l $err 2>/dev/null)
-    test "${sig}" = "${sig%[^A-Z]*}" || unset sig
+    test "${sig}" = "${sig%[!A-Za-z]*}" || unset sig
 fi
 
 if test -e "$ref"; then
@@ -116,6 +124,7 @@ if test -e "$ref"; then
         diff)   diff -u -w "$ref" "$outfile"            >$cmpfile ;;
         oneoff) oneoff     "$ref" "$outfile" "$fuzz"    >$cmpfile ;;
         stddev) stddev     "$ref" "$outfile" "$fuzz"    >$cmpfile ;;
+        null)   cat               "$outfile"            >$cmpfile ;;
     esac
     cmperr=$?
     test $err = 0 && err=$cmperr