mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-12 10:25:32 +02:00
![Michael Niedermayer](/assets/img/avatar_default.png)
* qatar/master: (23 commits) avconv: Reformat s16 volume adjustment. ARM: NEON optimised vector_fmac_scalar() dca: use vector_fmac_scalar from dsputil dsputil: add vector_fmac_scalar() latmenc: Fix private options vf_unsharp: store hsub/vsub in the filter context vf_unsharp: adopt a more natural order of params in apply_unsharp() vf_unsharp: rename method "unsharpen" to "apply_unsharp" vf_scale: apply the same transform to the aspect during init that is applied per frame vf_pad: fix "vsub" variable value computation vf_scale: add a "sar" variable lavfi: fix realloc size computation in avfilter_add_format() vsrc_color: use internal timebase lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() graphparser: prefer void * over AVClass * for log contexts avfiltergraph: use meaningful error codes avconv: Initialize return value for codec copy path. fate: use 'run' helper for seek-test fate: remove seek-mpeg2reuse test Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080. ... Conflicts: doc/filters.texi libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/graphparser.c libavfilter/vf_scale.c libavfilter/vsrc_color.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
141 lines
2.9 KiB
Bash
Executable File
141 lines
2.9 KiB
Bash
Executable File
#! /bin/sh
|
|
|
|
export LC_ALL=C
|
|
|
|
base=$(dirname $0)
|
|
. "${base}/md5.sh"
|
|
|
|
base64=tests/base64
|
|
|
|
test="${1#fate-}"
|
|
samples=$2
|
|
target_exec=$3
|
|
target_path=$4
|
|
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}"
|
|
errfile="${outdir}/${test}.err"
|
|
cmpfile="${outdir}/${test}.diff"
|
|
repfile="${outdir}/${test}.rep"
|
|
|
|
do_tiny_psnr(){
|
|
psnr=$(tests/tiny_psnr "$1" "$2" 2 0 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
|
|
echo "$psnr"
|
|
return 1
|
|
fi
|
|
}
|
|
|
|
oneoff(){
|
|
do_tiny_psnr "$1" "$2" MAXDIFF '<=' ${fuzz:-1}
|
|
}
|
|
|
|
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/"$@"
|
|
}
|
|
|
|
avconv(){
|
|
run $tool -v 0 -threads $threads -thread_type $thread_type "$@"
|
|
}
|
|
|
|
framecrc(){
|
|
avconv "$@" -f framecrc -
|
|
}
|
|
|
|
framemd5(){
|
|
avconv "$@" -f framemd5 -
|
|
}
|
|
|
|
crc(){
|
|
avconv "$@" -f crc -
|
|
}
|
|
|
|
md5(){
|
|
avconv "$@" md5:
|
|
}
|
|
|
|
pcm(){
|
|
avconv "$@" -vn -f s16le -
|
|
}
|
|
|
|
regtest(){
|
|
t="${test#$2-}"
|
|
ref=${base}/ref/$2/$t
|
|
${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$tool"
|
|
}
|
|
|
|
codectest(){
|
|
regtest codec $1 tests/$1
|
|
}
|
|
|
|
lavftest(){
|
|
regtest lavf lavf tests/vsynth1
|
|
}
|
|
|
|
lavfitest(){
|
|
cleanfiles="tests/data/lavfi/${test#lavfi-}.nut"
|
|
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
|
|
run 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-Za-z]*}" || unset sig
|
|
fi
|
|
|
|
if test -e "$ref"; then
|
|
case $cmp in
|
|
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
|
|
test $err = 0 || cat $cmpfile
|
|
else
|
|
echo "reference file '$ref' not found"
|
|
err=1
|
|
fi
|
|
|
|
echo "${test}:${sig:-$err}:$($base64 <$cmpfile):$($base64 <$errfile)" >$repfile
|
|
|
|
test $err = 0 && rm -f $outfile $errfile $cmpfile $cleanfiles
|
|
exit $err
|