fate: port remaining filters to new system.
authorClément Bœsch <ubitux@gmail.com>
Tue, 30 Apr 2013 00:08:48 +0000 (02:08 +0200)
committerClément Bœsch <ubitux@gmail.com>
Tue, 30 Apr 2013 00:12:45 +0000 (02:12 +0200)
Merge of b963f021b603509b5159873de4919dec441d0782 is now complete.

tests/Makefile
tests/fate-run.sh
tests/fate/avfilter.mak [deleted file]
tests/fate/filter-video.mak
tests/lavfi-regression.sh [deleted file]
tests/ref/fate/filter-pixfmts-tinterlace_merge [new file with mode: 0644]
tests/ref/fate/filter-pixfmts-tinterlace_pad [new file with mode: 0644]
tests/ref/lavfi/tinterlace_merge [deleted file]
tests/ref/lavfi/tinterlace_pad [deleted file]

index 8209435..6daf095 100644 (file)
@@ -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
index ea3fe72..4d5d214 100755 (executable)
@@ -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 (file)
index c8cf78c..0000000
+++ /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)
-
index 41e0ac9..c9a1f56 100644 (file)
@@ -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 (executable)
index 0f1920f..0000000
+++ /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/fate/filter-pixfmts-tinterlace_merge b/tests/ref/fate/filter-pixfmts-tinterlace_merge
new file mode 100644 (file)
index 0000000..300713f
--- /dev/null
@@ -0,0 +1,10 @@
+gray                c996e583bbc5a6f380463142eb77b7c6
+yuv410p             c9bad1317b496071d6d895238638e07d
+yuv420p             9794d11e59ec7bcdf9e30a433e4137b1
+yuv422p             e852e61e455db8ee3981ea942d510b0f
+yuv444p             a38a3f65d2f358cde5e9547c897cfcd5
+yuva420p            c1dc15d6ee78587d9f825acd795673d7
+yuvj420p            3ee7014727ee64b45292a4f15ba028d8
+yuvj422p            4f990d5473f15571276adb5770b3b773
+yuvj440p            9a005e8b8431aaa762fde8d942fd11a9
+yuvj444p            e29bf9f42e3a3632e09df529979e0040
diff --git a/tests/ref/fate/filter-pixfmts-tinterlace_pad b/tests/ref/fate/filter-pixfmts-tinterlace_pad
new file mode 100644 (file)
index 0000000..722ac85
--- /dev/null
@@ -0,0 +1,10 @@
+gray                25a7d1ccf1a06c1a8a0520c1e6cb30ff
+yuv410p             17163d1b4f21d894598fc62e6aeb8141
+yuv420p             f8bbae33295741c1c17d33ff8ee16f7f
+yuv422p             4fa67d1580d3453942bb0950c5784f6e
+yuv444p             f0558305fb7ca65b5b86d3ee88c4201e
+yuva420p            7c76c0ca03a62275d25e8140c68da2b9
+yuvj420p            b5b7baf11946a2265fc56e48be5b0436
+yuvj422p            2e70ab700851d12a773f926bb1785235
+yuvj440p            93319f9c8a02ee793966fae40f7e42fd
+yuvj444p            81a124fffe0214bee5205c90ae0dd201
diff --git a/tests/ref/lavfi/tinterlace_merge b/tests/ref/lavfi/tinterlace_merge
deleted file mode 100644 (file)
index 300713f..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-gray                c996e583bbc5a6f380463142eb77b7c6
-yuv410p             c9bad1317b496071d6d895238638e07d
-yuv420p             9794d11e59ec7bcdf9e30a433e4137b1
-yuv422p             e852e61e455db8ee3981ea942d510b0f
-yuv444p             a38a3f65d2f358cde5e9547c897cfcd5
-yuva420p            c1dc15d6ee78587d9f825acd795673d7
-yuvj420p            3ee7014727ee64b45292a4f15ba028d8
-yuvj422p            4f990d5473f15571276adb5770b3b773
-yuvj440p            9a005e8b8431aaa762fde8d942fd11a9
-yuvj444p            e29bf9f42e3a3632e09df529979e0040
diff --git a/tests/ref/lavfi/tinterlace_pad b/tests/ref/lavfi/tinterlace_pad
deleted file mode 100644 (file)
index 722ac85..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-gray                25a7d1ccf1a06c1a8a0520c1e6cb30ff
-yuv410p             17163d1b4f21d894598fc62e6aeb8141
-yuv420p             f8bbae33295741c1c17d33ff8ee16f7f
-yuv422p             4fa67d1580d3453942bb0950c5784f6e
-yuv444p             f0558305fb7ca65b5b86d3ee88c4201e
-yuva420p            7c76c0ca03a62275d25e8140c68da2b9
-yuvj420p            b5b7baf11946a2265fc56e48be5b0436
-yuvj422p            2e70ab700851d12a773f926bb1785235
-yuvj440p            93319f9c8a02ee793966fae40f7e42fd
-yuvj444p            81a124fffe0214bee5205c90ae0dd201