fate: port remaining filters to new system.

Merge of b963f021b603509b5159873de4919dec441d0782 is now complete.

7 files changed, 7 insertions, 81 deletions

diff --git a/tests/Makefile b/tests/Makefile
index 8209435501..6daf095a75 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -68,9 +68,6 @@ include $(SRC_PATH)/tests/fate/vcodec.mak
 include $(SRC_PATH)/tests/fate/avformat.mak
 include $(SRC_PATH)/tests/fate/seek.mak
 
-#FIXME should be removed
-include $(SRC_PATH)/tests/fate/avfilter.mak
-
 include $(SRC_PATH)/tests/fate/aac.mak
 include $(SRC_PATH)/tests/fate/ac3.mak
 include $(SRC_PATH)/tests/fate/adpcm.mak
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index ea3fe72bd7..4d5d214776 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -160,12 +160,6 @@ lavftest(){
     regtest lavf lavf tests/vsynth1
 }
 
-#FIXME should be removed
-lavfitest(){
-    cleanfiles="tests/data/lavfi/${test#lavfi-}.nut"
-    regtest lavfi lavfi tests/vsynth1
-}
-
 video_filter(){
     filters=$1
     shift
@@ -186,6 +180,7 @@ pixdesc(){
 
 pixfmts(){
     filter=${test#filter-pixfmts-}
+    filter=${filter%_*}
     filter_args=$1
     prefilter_chain=$2
 
diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak
deleted file mode 100644
index c8cf78c677..0000000000
--- a/tests/fate/avfilter.mak
+++ /dev/null
@@ -1,13 +0,0 @@
-#FIXME the whole file should be removed
-
-FATE_LAVFI-$(CONFIG_GPL) += fate-lavfi-tinterlace_merge                 \
-                            fate-lavfi-tinterlace_pad                   \
-
-FATE_LAVFI += $(FATE_LAVFI-yes)
-
-$(FATE_LAVFI): $(VREF) libavfilter/filtfmts-test$(EXESUF)
-$(FATE_LAVFI): CMD = lavfitest
-
-FATE_AVCONV += $(FATE_LAVFI)
-fate-lavfi:    $(FATE_LAVFI)
-
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index 41e0ac9197..c9a1f56e21 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@ -207,6 +207,12 @@ fate-filter-pixfmts-scale: CMD = pixfmts "200:100"
 FATE_FILTER_PIXFMTS-$(CONFIG_SUPER2XSAI_FILTER) += fate-filter-pixfmts-super2xsai
 fate-filter-pixfmts-super2xsai: CMD = pixfmts
 
+FATE_FILTER_PIXFMTS-$(CONFIG_TINTERLACE_FILTER) += fate-filter-pixfmts-tinterlace_merge
+fate-filter-pixfmts-tinterlace_merge: CMD = pixfmts "merge"
+
+FATE_FILTER_PIXFMTS-$(CONFIG_TINTERLACE_FILTER) += fate-filter-pixfmts-tinterlace_pad
+fate-filter-pixfmts-tinterlace_pad: CMD = pixfmts "pad"
+
 FATE_FILTER_PIXFMTS-$(CONFIG_VFLIP_FILTER) += fate-filter-pixfmts-vflip
 fate-filter-pixfmts-vflip: CMD = pixfmts
 
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
deleted file mode 100755
index 0f1920fdfb..0000000000
--- a/tests/lavfi-regression.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-#
-# automatic regression test for libavfilter
-#
-#
-#set -x
-
-#FIXME the whole file should be removed
-
-set -e
-
-. $(dirname $0)/regression-funcs.sh
-
-eval do_$test=y
-
-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_pixfmts(){
-    testname=$1;
-    test ${test%_[bl]e} = $testname || return 0
-    filter=$2
-    filter_args=$3
-    prefilter_chain=$4
-
-    showfiltfmts="$target_exec $target_path/libavfilter/filtfmts-test"
-    scale_exclude_fmts=${outfile}${testname}_scale_exclude_fmts
-    scale_in_fmts=${outfile}${testname}_scale_in_fmts
-    scale_out_fmts=${outfile}${testname}_scale_out_fmts
-    in_fmts=${outfile}${testname}_in_fmts
-
-    # exclude pixel formats which are not supported as input
-    $showfiltfmts scale | awk -F '[ \r]' '/^INPUT/{ fmt=substr($3, 5); print fmt }' | sort >$scale_in_fmts
-    $showfiltfmts scale | awk -F '[ \r]' '/^OUTPUT/{ fmt=substr($3, 5); print fmt }' | sort >$scale_out_fmts
-    comm -12 $scale_in_fmts $scale_out_fmts >$scale_exclude_fmts
-
-    $showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ fmt=substr($3, 5); print fmt }' | sort >$in_fmts
-    pix_fmts=$(comm -12 $scale_exclude_fmts $in_fmts)
-
-    for pix_fmt in $pix_fmts; do
-        do_video_filter $pix_fmt "${prefilter_chain}format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt
-    done
-
-    rm $in_fmts $scale_in_fmts $scale_out_fmts $scale_exclude_fmts
-}
-
-# all these filters have exactly one input and exactly one output
-do_lavfi_pixfmts "tinterlace_merge"    "tinterlace" "merge"
-do_lavfi_pixfmts "tinterlace_pad"      "tinterlace" "pad"
-
-# TODO: add tests for
-# direct rendering,
-# chains with feedback loops
diff --git a/tests/ref/lavfi/tinterlace_merge b/tests/ref/fate/filter-pixfmts-tinterlace_merge
index 300713f747..300713f747 100644
--- a/tests/ref/lavfi/tinterlace_merge
+++ b/tests/ref/fate/filter-pixfmts-tinterlace_merge
diff --git a/tests/ref/lavfi/tinterlace_pad b/tests/ref/fate/filter-pixfmts-tinterlace_pad
index 722ac85aeb..722ac85aeb 100644
--- a/tests/ref/lavfi/tinterlace_pad
+++ b/tests/ref/fate/filter-pixfmts-tinterlace_pad