X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=tests%2Flavfi-regression.sh;h=f8c0c4e75b1e013bd384a41bc2c8ffee891d21e3;hb=454b1f9b5831ff53d098be737feb7b1e3d73f1d3;hp=252a895acd253fd2efaec2872b3e7f785eae942e;hpb=fc25373b1bf86962ff3e7dff1fc8975c0189d36b;p=ffmpeg

diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
index 252a895acd2..f8c0c4e75b1 100755
--- a/tests/lavfi-regression.sh
+++ b/tests/lavfi-regression.sh
@@ -11,86 +11,68 @@ set -e
 
 eval do_$test=y
 
-rm -f "$logfile"
-rm -f "$benchfile"
-
-get_common_elements() (
-    for elt1 in $1; do
-        for elt2 in $2; do
-            [ $elt1 = $elt2 ] && res="$res $elt1 "
-        done
-    done
-
-    echo $res
-)
-
-# Returns the elements present in $1 but not in $2.
-get_exclusive_elements() (
-    for elt1 in $1; do
-        common=""
-        for elt2 in $2; do
-            [ $elt1 = $elt2 ] && common="true" && break;
-        done
-        [ -z "$common" ] && res="$res $elt1"
-    done
-
-    echo $res
-)
+do_video_filter() {
+    label=$1
+    filters=$2
+    shift 2
+    printf '%-20s' $label
+    run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src    \
+        $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5:
+}
 
 do_lavfi() {
     vfilters="slicify=random,$2"
 
     if [ $test = $1 ] ; then
-        do_video_encoding ${test}.nut "" "-vcodec rawvideo -vf $vfilters"
+        do_video_filter $test "$vfilters"
     fi
 }
 
-do_lavfi "crop"               "crop=100:100"
-do_lavfi "crop_scale"         "crop=100:100,scale=400:-1"
-do_lavfi "crop_scale_vflip"   "null,null,crop=200:200,crop=20:20,scale=200:200,scale=250:250,vflip,vflip,null,scale=200:200,crop=100:100,vflip,scale=200:200,null,vflip,crop=100:100,null"
-do_lavfi "crop_vflip"         "crop=100:100,vflip"
+do_lavfi "crop"               "crop=iw-100:ih-100:100:100"
+do_lavfi "crop_scale"         "crop=iw-100:ih-100:100:100,scale=400:-1"
+do_lavfi "crop_scale_vflip"   "null,null,crop=iw-200:ih-200:200:200,crop=iw-20:ih-20:20:20,scale=200:200,scale=250:250,vflip,vflip,null,scale=200:200,crop=iw-100:ih-100:100:100,vflip,scale=200:200,null,vflip,crop=iw-100:ih-100:100:100,null"
+do_lavfi "crop_vflip"         "crop=iw-100:ih-100:100:100,vflip"
 do_lavfi "null"               "null"
 do_lavfi "scale200"           "scale=200:200"
 do_lavfi "scale500"           "scale=500:500"
 do_lavfi "vflip"              "vflip"
-do_lavfi "vflip_crop"         "vflip,crop=100:100"
+do_lavfi "vflip_crop"         "vflip,crop=iw-100:ih-100:100:100"
 do_lavfi "vflip_vflip"        "vflip,vflip"
 
-# all these filters have exactly one input and exactly one output
-filters_args="
-crop=100:100:100:100
-null
-pad=500:400:20:20
-scale=200:100
-vflip
-"
-
-if [ -n "$do_pixfmts_be" ] || [ -n "$do_pixfmts_le" ]; then
-    # exclude pixel formats which are not supported as input
-    excluded_pix_fmts="$(ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut -d' ' -f2)"
+do_lavfi_pixfmts(){
+    test ${test%_[bl]e} = pixfmts_$1 || return 0
+    filter=$1
+    filter_args=$2
 
-    scale_out_pix_fmts=$(tools/lavfi-showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2)
-    scale_out_pix_fmts=$(get_exclusive_elements "$scale_out_pix_fmts" "$excluded_pix_fmts")
+    showfiltfmts="$target_exec $target_path/tools/lavfi-showfiltfmts"
+    exclude_fmts=${outfile}${1}_exclude_fmts
+    out_fmts=${outfile}${1}_out_fmts
 
-    for filter_args in $filters_args; do
-        filter=$(echo $filter_args | sed -e 's/\([^=]\+\)=.*/\1/')
-        in_pix_fmts=$(tools/lavfi-showfiltfmts $filter | grep "^INPUT" | cut -d: -f2)
-        pix_fmts=$(get_common_elements "$in_pix_fmts" "$scale_out_pix_fmts")
+    # exclude pixel formats which are not supported as input
+    $avconv -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut -d' ' -f2 | sort >$exclude_fmts
+    $showfiltfmts scale | awk -F '[ \r]' '/^OUTPUT/{ print $3 }' | sort | comm -23 - $exclude_fmts >$out_fmts
 
-        for pix_fmt in $pix_fmts; do
-            do_video_encoding "${pix_fmt}-${filter}.nut" "" \
-                "-vf slicify=random,format=$pix_fmt,$filter_args -vcodec rawvideo -pix_fmt $pix_fmt"
-        done
+    pix_fmts=$($showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ print $3 }' | sort | comm -12 - $out_fmts)
+    for pix_fmt in $pix_fmts; do
+        do_video_filter $pix_fmt "slicify=random,format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt
     done
-fi
 
-if [ -n "$do_pixdesc_be" ] || [ -n "$do_pixdesc_le" ]; then
-    pix_fmts="$($ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^IO' | cut -d' ' -f2)"
+    rm $exclude_fmts $out_fmts
+}
+
+# all these filters have exactly one input and exactly one output
+do_lavfi_pixfmts "copy"    ""
+do_lavfi_pixfmts "crop"    "100:100:100:100"
+do_lavfi_pixfmts "hflip"   ""
+do_lavfi_pixfmts "null"    ""
+do_lavfi_pixfmts "pad"     "500:400:20:20"
+do_lavfi_pixfmts "scale"   "200:100"
+do_lavfi_pixfmts "vflip"   ""
+
+if [ -n "$do_pixdesc" ]; then
+    pix_fmts="$($avconv -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^IO' | cut -d' ' -f2 | sort)"
     for pix_fmt in $pix_fmts; do
-        output=lavfi_pixdesc-${pix_fmt}.nut
-        do_video_encoding $output "" \
-            "-vf slicify=random,format=$pix_fmt,pixdesctest -vcodec rawvideo -pix_fmt $pix_fmt"
-        rm ${outfile}${output}
+        do_video_filter $pix_fmt "slicify=random,format=$pix_fmt,pixdesctest" -pix_fmt $pix_fmt
     done
 fi