fate: move lavd filters tests to the new system.

Also make life test a bit more useful.

10 files changed, 107 insertions, 21 deletions

diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak
index 1dd8cca598..af078aa7de 100644
--- a/tests/fate/avfilter.mak
+++ b/tests/fate/avfilter.mak
@@ -3,10 +3,6 @@
 FATE_LAVFI = fate-lavfi-field                                           \
              fate-lavfi-il                                              \
 
-FATE_LAVFI-$(CONFIG_AVDEVICE) += fate-lavfi-life                        \
-                                 fate-lavfi-scalenorm                   \
-                                 fate-lavfi-testsrc                     \
-
 FATE_LAVFI-$(CONFIG_GPL) += fate-lavfi-kerndeint                        \
                             fate-lavfi-pixfmts_super2xsai               \
                             fate-lavfi-tinterlace_merge                 \
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index 127bb55cb2..82843ac808 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@ -12,6 +12,16 @@ FATE_FILTER-$(call FILTERDEMDEC, YADIF, MPEGTS, MPEG2VIDEO) += $(FATE_YADIF)
 FATE_SAMPLES_AVCONV += $(FATE_FILTER-yes)
 
 
+FATE_FILTER-$(call ALLYES, AVDEVICE LIFE_FILTER) += fate-filter-lavd-life
+fate-filter-lavd-life: CMD = framecrc -f lavfi -i life=s=40x40:r=5:seed=42:mold=64:ratio=0.1:death_color=red:life_color=green -t 2
+
+FATE_FILTER-$(call ALLYES, AVDEVICE TESTSRC_FILTER) += fate-filter-lavd-testsrc
+fate-filter-lavd-testsrc: CMD = framecrc -f lavfi -i testsrc=r=7:n=2:d=10
+
+FATE_FILTER-$(call ALLYES, AVDEVICE TESTSRC_FILTER FORMAT_FILTER CONCAT_FILTER SCALE_FILTER) += fate-filter-lavd-scalenorm
+fate-filter-lavd-scalenorm: CMD = framecrc -f lavfi -graph_file $(SRC_PATH)/tests/filtergraphs/scalenorm -i dummy
+
+
 FATE_FILTER_VSYNTH-$(CONFIG_BOXBLUR_FILTER) += fate-filter-boxblur
 fate-filter-boxblur: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf boxblur=2:1
 
diff --git a/tests/filtergraphs/scalenorm b/tests/filtergraphs/scalenorm
new file mode 100644
index 0000000000..17b69de186
--- /dev/null
+++ b/tests/filtergraphs/scalenorm
@@ -0,0 +1,4 @@
+sws_flags=+accurate_rnd+bitexact;
+testsrc=s=128x96  : d=1:r=5, format=yuv420p [a];
+testsrc=s=160x120 : d=1:r=5                 [b];
+[a][b] concat=unsafe=1, scale=flags=+accurate_rnd+bitexact
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
index 2c21c10d9a..b455b81474 100755
--- a/tests/lavfi-regression.sh
+++ b/tests/lavfi-regression.sh
@@ -59,20 +59,6 @@ do_lavfi_pixfmts "pixfmts_super2xsai"  "super2xsai"
 do_lavfi_pixfmts "tinterlace_merge"    "tinterlace" "merge"
 do_lavfi_pixfmts "tinterlace_pad"      "tinterlace" "pad"
 
-do_lavfi_lavd() {
-    label=$1
-    graph=$2
-    shift 2
-    [ $test = $label ] || return 0
-    printf '%-20s' $label
-    run_avconv $DEC_OPTS -f lavfi -i $graph \
-        $ENC_OPTS -vcodec rawvideo $* -f nut md5:
-}
-
-do_lavfi_lavd "life"                 "life=s=40x40:r=5:seed=42:mold=64" -t 2
-do_lavfi_lavd "testsrc"              "testsrc=r=7:n=2:d=10"
-do_lavfi_lavd "scalenorm"            "sws_flags=+accurate_rnd+bitexact;testsrc=s=128x96:d=1:r=5,format=yuv420p[a];testsrc=s=160x120:d=1:r=5[b];[a][b]concat=unsafe=1,scale=flags=+accurate_rnd+bitexact"
-
 # TODO: add tests for
 # direct rendering,
 # chains with feedback loops
diff --git a/tests/ref/fate/filter-lavd-life b/tests/ref/fate/filter-lavd-life
new file mode 100644
index 0000000000..565f88ab7a
--- /dev/null
+++ b/tests/ref/fate/filter-lavd-life
@@ -0,0 +1,11 @@
+#tb 0: 1/5
+0,          0,          0,        1,     4800, 0xf2a15b15
+0,          1,          1,        1,     4800, 0x78c29dcf
+0,          2,          2,        1,     4800, 0x28509d6e
+0,          3,          3,        1,     4800, 0xb9d0841a
+0,          4,          4,        1,     4800, 0x53ac6a72
+0,          5,          5,        1,     4800, 0x6e6a6587
+0,          6,          6,        1,     4800, 0x6de46287
+0,          7,          7,        1,     4800, 0x7e0d5b95
+0,          8,          8,        1,     4800, 0xf30f5a1b
+0,          9,          9,        1,     4800, 0x84505420
diff --git a/tests/ref/fate/filter-lavd-scalenorm b/tests/ref/fate/filter-lavd-scalenorm
new file mode 100644
index 0000000000..4d09a0d739
--- /dev/null
+++ b/tests/ref/fate/filter-lavd-scalenorm
@@ -0,0 +1,11 @@
+#tb 0: 1/5
+0,          0,          0,        1,    18432, 0xdd8a4db8
+0,          1,          1,        1,    18432, 0xc0144dbe
+0,          2,          2,        1,    18432, 0x1d264db6
+0,          3,          3,        1,    18432, 0x49e44dcb
+0,          4,          4,        1,    18432, 0x81404dc1
+0,          5,          5,        1,    18432, 0xd163688e
+0,          6,          6,        1,    18432, 0x63f869bb
+0,          7,          7,        1,    18432, 0xee606528
+0,          8,          8,        1,    18432, 0x44445e77
+0,          9,          9,        1,    18432, 0x830a57b4
diff --git a/tests/ref/fate/filter-lavd-testsrc b/tests/ref/fate/filter-lavd-testsrc
new file mode 100644
index 0000000000..0ea5a49531
--- /dev/null
+++ b/tests/ref/fate/filter-lavd-testsrc
@@ -0,0 +1,71 @@
+#tb 0: 1/7
+0,          0,          0,        1,   230400, 0x88c4d19a
+0,          1,          1,        1,   230400, 0xcc930a2e
+0,          2,          2,        1,   230400, 0x8e1b0e23
+0,          3,          3,        1,   230400, 0xff3b5a72
+0,          4,          4,        1,   230400, 0xb0ad3760
+0,          5,          5,        1,   230400, 0x8013eaaf
+0,          6,          6,        1,   230400, 0xa6eaa9c3
+0,          7,          7,        1,   230400, 0xef4695a2
+0,          8,          8,        1,   230400, 0x8f144889
+0,          9,          9,        1,   230400, 0x693779f9
+0,         10,         10,        1,   230400, 0xedaf92f0
+0,         11,         11,        1,   230400, 0x1c39d7c4
+0,         12,         12,        1,   230400, 0xb72589bb
+0,         13,         13,        1,   230400, 0x61c2de4a
+0,         14,         14,        1,   230400, 0xc46085ae
+0,         15,         15,        1,   230400, 0xad059d62
+0,         16,         16,        1,   230400, 0xe82ea157
+0,         17,         17,        1,   230400, 0xa30aeda6
+0,         18,         18,        1,   230400, 0x7f86ca94
+0,         19,         19,        1,   230400, 0x4c4f7df2
+0,         20,         20,        1,   230400, 0x535a3d06
+0,         21,         21,        1,   230400, 0x449262ff
+0,         22,         22,        1,   230400, 0x971c15e6
+0,         23,         23,        1,   230400, 0xda1d4756
+0,         24,         24,        1,   230400, 0x78ad604d
+0,         25,         25,        1,   230400, 0x72d8a521
+0,         26,         26,        1,   230400, 0x8f395718
+0,         27,         27,        1,   230400, 0x6e57aba7
+0,         28,         28,        1,   230400, 0x54ad968f
+0,         29,         29,        1,   230400, 0x59d9ae43
+0,         30,         30,        1,   230400, 0x843fb238
+0,         31,         31,        1,   230400, 0x0f77fe87
+0,         32,         32,        1,   230400, 0x8c8adb75
+0,         33,         33,        1,   230400, 0xdd568ed3
+0,         34,         34,        1,   230400, 0x38bd4de7
+0,         35,         35,        1,   230400, 0x62ad62ff
+0,         36,         36,        1,   230400, 0x1f0215e6
+0,         37,         37,        1,   230400, 0xe8534756
+0,         38,         38,        1,   230400, 0x3d36604d
+0,         39,         39,        1,   230400, 0x0c57a521
+0,         40,         40,        1,   230400, 0x2b555718
+0,         41,         41,        1,   230400, 0x2a3faba7
+0,         42,         42,        1,   230400, 0x4e0a74cd
+0,         43,         43,        1,   230400, 0xa06b8c81
+0,         44,         44,        1,   230400, 0x61f39076
+0,         45,         45,        1,   230400, 0xd313dcc5
+0,         46,         46,        1,   230400, 0x8485b9b3
+0,         47,         47,        1,   230400, 0x53eb6d11
+0,         48,         48,        1,   230400, 0x7ac22c25
+0,         49,         49,        1,   230400, 0xce7b84c1
+0,         50,         50,        1,   230400, 0x6e4937a8
+0,         51,         51,        1,   230400, 0x486c6918
+0,         52,         52,        1,   230400, 0xcce4820f
+0,         53,         53,        1,   230400, 0xfb5fc6e3
+0,         54,         54,        1,   230400, 0x965a78da
+0,         55,         55,        1,   230400, 0x40f7cd69
+0,         56,         56,        1,   230400, 0x68db63ec
+0,         57,         57,        1,   230400, 0x51807ba0
+0,         58,         58,        1,   230400, 0x8ca97f95
+0,         59,         59,        1,   230400, 0x4785cbe4
+0,         60,         60,        1,   230400, 0x2401a8d2
+0,         61,         61,        1,   230400, 0xf0bb5c30
+0,         62,         62,        1,   230400, 0xf7c61b44
+0,         63,         63,        1,   230400, 0x7d7e521e
+0,         64,         64,        1,   230400, 0xd0080505
+0,         65,         65,        1,   230400, 0x13183675
+0,         66,         66,        1,   230400, 0xb1994f6c
+0,         67,         67,        1,   230400, 0xabc49440
+0,         68,         68,        1,   230400, 0xc8254637
+0,         69,         69,        1,   230400, 0xa7439ac6
diff --git a/tests/ref/lavfi/life b/tests/ref/lavfi/life
deleted file mode 100644
index 05713f3a7c..0000000000
--- a/tests/ref/lavfi/life
+++ /dev/null
@@ -1 +0,0 @@
-life                bc4822aa5d473a8b5efb31fef7aeac86
diff --git a/tests/ref/lavfi/scalenorm b/tests/ref/lavfi/scalenorm
deleted file mode 100644
index 6df4bb8d9b..0000000000
--- a/tests/ref/lavfi/scalenorm
+++ /dev/null
@@ -1 +0,0 @@
-scalenorm           cad5d7b40b213deecc1d156cf45fc70d
diff --git a/tests/ref/lavfi/testsrc b/tests/ref/lavfi/testsrc
deleted file mode 100644
index 8e2363b89b..0000000000
--- a/tests/ref/lavfi/testsrc
+++ /dev/null
@@ -1 +0,0 @@
-testsrc             cdac8817054b30e086d6ecabdcec5444