ffmpeg: factorize quality calculation

[ffmpeg] / tests / fate-run.sh

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 045a96818c1d5dd81a717fd06c9efa7272661928..366145d22f20fb64fd02020ce8bc18421a4ed7f9 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,8 @@ command=$5
 cmp=${6:-diff}
 ref=${7:-"${base}/ref/fate/${test}"}
 fuzz=$8
+threads=${9:-1}
+thread_type=${10:-3}
 
 outdir="tests/data/fate"
 outfile="${outdir}/${test}"
@@ -25,7 +29,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,8 +44,13 @@ stddev(){
     do_tiny_psnr "$1" "$2" stddev  '<=' ${fuzz:-1}
 }
 
+run(){
+    test "${V:-0}" -gt 0 && echo "$target_exec" $target_path/"$@" >&3
+    $target_exec $target_path/"$@"
+}
+
 ffmpeg(){
-    $target_exec $target_path/ffmpeg "$@"
+    run ffmpeg -v 0 -threads $threads -thread_type $thread_type "$@"
 }
 
 framecrc(){
@@ -70,7 +79,7 @@ regtest(){
     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"
 }
 
 codectest(){
@@ -103,6 +112,7 @@ seektest(){
 
 mkdir -p "$outdir"
 
+exec 3>&2
 $command > "$outfile" 2>$errfile
 err=$?