command=$5
cmp=${6:-diff}
ref=${7:-"${base}/ref/fate/${test}"}
-fuzz=$8
+fuzz=${8:-1}
threads=${9:-1}
-thread_type=${10:-3}
+thread_type=${10:-frame+slice}
+cpuflags=${11:-all}
+cmp_shift=${12:-0}
+cmp_target=${13:-0}
+size_tolerance=${14:-0}
+cmp_unit=${15:-2}
outdir="tests/data/fate"
outfile="${outdir}/${test}"
cmpfile="${outdir}/${test}.diff"
repfile="${outdir}/${test}.rep"
+target_path(){
+ test ${1} = ${1#/} && p=${target_path}/
+ echo ${p}${1}
+}
+
+# $1=value1, $2=value2, $3=threshold
+# prints 0 if absolute difference between value1 and value2 is <= threshold
+compare(){
+ echo "scale=2; v = $1 - $2; if (v < 0) v = -v; if (v > $3) r = 1; r" | bc
+}
+
do_tiny_psnr(){
- psnr=$(tests/tiny_psnr "$1" "$2" 2 0 0)
+ psnr=$(tests/tiny_psnr "$1" "$2" $cmp_unit $cmp_shift 0)
val=$(expr "$psnr" : ".*$3: *\([0-9.]*\)")
size1=$(expr "$psnr" : '.*bytes: *\([0-9]*\)')
size2=$(expr "$psnr" : '.*bytes:[ 0-9]*/ *\([0-9]*\)')
- res=$(echo "if ($val $4 $5) 1" | bc)
- if [ "$res" != 1 ] || [ $size1 != $size2 ]; then
+ val_cmp=$(compare $val $cmp_target $fuzz)
+ size_cmp=$(compare $size1 $size2 $size_tolerance)
+ if [ "$val_cmp" != 0 ] || [ "$size_cmp" != 0 ]; then
echo "$psnr"
return 1
fi
}
oneoff(){
- do_tiny_psnr "$1" "$2" MAXDIFF '<=' ${fuzz:-1}
+ do_tiny_psnr "$1" "$2" MAXDIFF
}
stddev(){
- do_tiny_psnr "$1" "$2" stddev '<=' ${fuzz:-1}
+ do_tiny_psnr "$1" "$2" stddev
+}
+
+oneline(){
+ printf '%s\n' "$1" | diff -u -b - "$2"
}
run(){
$target_exec $target_path/"$@"
}
-ffmpeg(){
- run ffmpeg -v 0 -threads $threads -thread_type $thread_type "$@"
+probefmt(){
+ run avprobe -show_format_entry format_name -v 0 "$@"
+}
+
+avconv(){
+ dec_opts="-threads $threads -thread_type $thread_type"
+ avconv_args="-nostats -cpuflags $cpuflags"
+ for arg in $@; do
+ [ x${arg} = x-i ] && avconv_args="${avconv_args} ${dec_opts}"
+ avconv_args="${avconv_args} ${arg}"
+ done
+ run avconv ${avconv_args}
}
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 -
+}
+
+enc_dec_pcm(){
+ out_fmt=$1
+ dec_fmt=$2
+ pcm_fmt=$3
+ src_file=$(target_path $4)
+ shift 4
+ encfile="${outdir}/${test}.${out_fmt}"
+ cleanfiles=$encfile
+ encfile=$(target_path ${encfile})
+ avconv -i $src_file "$@" -f $out_fmt -y ${encfile} || return
+ avconv -f $out_fmt -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} -
+}
+
+FLAGS="-flags +bitexact -sws_flags +accurate_rnd+bitexact"
+DEC_OPTS="-threads $threads -idct simple $FLAGS"
+ENC_OPTS="-threads 1 -idct simple -dct fastint"
+
+enc_dec(){
+ src_fmt=$1
+ srcfile=$2
+ enc_fmt=$3
+ enc_opt=$4
+ dec_fmt=$5
+ dec_opt=$6
+ encfile="${outdir}/${test}.${enc_fmt}"
+ decfile="${outdir}/${test}.out.${dec_fmt}"
+ cleanfiles="$cleanfiles $decfile"
+ test "$7" = -keep || cleanfiles="$cleanfiles $encfile"
+ tsrcfile=$(target_path $srcfile)
+ tencfile=$(target_path $encfile)
+ tdecfile=$(target_path $decfile)
+ avconv -f $src_fmt $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt $FLAGS \
+ -f $enc_fmt -y $tencfile || return
+ do_md5sum $encfile
+ echo $(wc -c $encfile)
+ avconv $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \
+ -f $dec_fmt -y $tdecfile || return
+ do_md5sum $decfile
+ tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift
}
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" "$threads" "$thread_type"
-}
-
-codectest(){
- regtest codec $1 tests/$1
+ ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags"
}
lavftest(){
regtest lavfi lavfi tests/vsynth1
}
-seektest(){
- t="${test#seek-}"
- ref=${base}/ref/seek/$t
- case $t in
- image_*) file="tests/data/images/${t#image_}/%02d.${t#image_}" ;;
- *) file=$(echo $t | tr _ '?')
- for d in acodec vsynth2 lavf; do
- test -f tests/data/$d/$file && break
- done
- file=$(echo tests/data/$d/$file)
- ;;
- esac
- $target_exec $target_path/tests/seek_test $target_path/$file
-}
-
mkdir -p "$outdir"
exec 3>&2
-$command > "$outfile" 2>$errfile
+eval $command >"$outfile" 2>$errfile
err=$?
if [ $err -gt 128 ]; then
test "${sig}" = "${sig%[!A-Za-z]*}" || unset sig
fi
-if test -e "$ref"; then
+if test -e "$ref" || test $cmp = "oneline" ; then
case $cmp in
- diff) diff -u -w "$ref" "$outfile" >$cmpfile ;;
- oneoff) oneoff "$ref" "$outfile" "$fuzz" >$cmpfile ;;
- stddev) stddev "$ref" "$outfile" "$fuzz" >$cmpfile ;;
+ diff) diff -u -b "$ref" "$outfile" >$cmpfile ;;
+ oneoff) oneoff "$ref" "$outfile" >$cmpfile ;;
+ stddev) stddev "$ref" "$outfile" >$cmpfile ;;
+ oneline)oneline "$ref" "$outfile" >$cmpfile ;;
+ null) cat "$outfile" >$cmpfile ;;
esac
cmperr=$?
test $err = 0 && err=$cmperr