fate: move alphaextract and alphamerge tests to the new system.
authorClément Bœsch <ubitux@gmail.com>
Mon, 29 Apr 2013 18:59:52 +0000 (20:59 +0200)
committerClément Bœsch <ubitux@gmail.com>
Mon, 29 Apr 2013 19:10:13 +0000 (21:10 +0200)
The standalone alphaextract tests are removed since already the filters
are already tested by the alphamerge tests.

tests/fate/avfilter.mak
tests/fate/filter-video.mak
tests/filtergraphs/alphamerge_alphaextract_rgb [new file with mode: 0644]
tests/filtergraphs/alphamerge_alphaextract_yuv [new file with mode: 0644]
tests/lavfi-regression.sh
tests/ref/fate/filter-alphaextract_alphamerge_rgb [new file with mode: 0644]
tests/ref/fate/filter-alphaextract_alphamerge_yuv [new file with mode: 0644]
tests/ref/lavfi/alphaextract_rgb [deleted file]
tests/ref/lavfi/alphaextract_yuv [deleted file]
tests/ref/lavfi/alphamerge_rgb [deleted file]
tests/ref/lavfi/alphamerge_yuv [deleted file]

index 912563b..1dd8cca 100644 (file)
@@ -1,10 +1,6 @@
 #FIXME the whole file should be removed
 
-FATE_LAVFI = fate-lavfi-alphaextract_rgb                                \
-             fate-lavfi-alphaextract_yuv                                \
-             fate-lavfi-alphamerge_rgb                                  \
-             fate-lavfi-alphamerge_yuv                                  \
-             fate-lavfi-field                                           \
+FATE_LAVFI = fate-lavfi-field                                           \
              fate-lavfi-il                                              \
 
 FATE_LAVFI-$(CONFIG_AVDEVICE) += fate-lavfi-life                        \
index 86f6e13..c47deb4 100644 (file)
@@ -72,6 +72,12 @@ fate-filter-gradfun-sample: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -filter_scri
 FATE_FILTER-$(call ALLYES, TESTSRC_FILTER SINE_FILTER CONCAT_FILTER) += fate-filter-concat
 fate-filter-concat: CMD = framecrc -filter_complex_script $(SRC_PATH)/tests/filtergraphs/concat
 
+FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER SPLIT_FILTER ALPHAEXTRACT_FILTER ALPHAMERGE_FILTER) += fate-filter-alphaextract_alphamerge_rgb
+fate-filter-alphaextract_alphamerge_rgb: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/alphamerge_alphaextract_rgb
+
+FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER SPLIT_FILTER ALPHAEXTRACT_FILTER ALPHAMERGE_FILTER) += fate-filter-alphaextract_alphamerge_yuv
+fate-filter-alphaextract_alphamerge_yuv: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/alphamerge_alphaextract_yuv
+
 FATE_FILTER_VSYNTH-$(CONFIG_CROP_FILTER) += fate-filter-crop
 fate-filter-crop: CMD = video_filter "crop=iw-100:ih-100:100:100"
 
diff --git a/tests/filtergraphs/alphamerge_alphaextract_rgb b/tests/filtergraphs/alphamerge_alphaextract_rgb
new file mode 100644 (file)
index 0000000..0f9dc4f
--- /dev/null
@@ -0,0 +1,3 @@
+format=bgra, split, alphamerge, split [x][y];
+[y]        alphaextract [alpha];
+[x][alpha] alphamerge
diff --git a/tests/filtergraphs/alphamerge_alphaextract_yuv b/tests/filtergraphs/alphamerge_alphaextract_yuv
new file mode 100644 (file)
index 0000000..48546f6
--- /dev/null
@@ -0,0 +1,3 @@
+format=yuv420p, split, alphamerge, split [x][y];
+[y]        alphaextract [alpha];
+[x][alpha] alphamerge
index d27f07f..2c21c10 100755 (executable)
@@ -22,23 +22,6 @@ do_video_filter() {
         $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5:
 }
 
-do_lavfi_plain() {
-    vfilters="$2"
-
-    if [ $test = $1 ] ; then
-        do_video_filter $test "$2"
-    fi
-}
-
-do_lavfi() {
-    do_lavfi_plain $1 "$2"
-}
-
-do_lavfi_plain "alphamerge_rgb"     "[in]format=bgra,split,alphamerge[out]"
-do_lavfi_plain "alphamerge_yuv"     "[in]format=yuv420p,split,alphamerge[out]"
-do_lavfi_plain "alphaextract_rgb"   "[in]format=bgra,split,alphamerge,split[o3][o4];[o4]alphaextract[alpha];[o3][alpha]alphamerge[out]"
-do_lavfi_plain "alphaextract_yuv"   "[in]format=yuv420p,split,alphamerge,split[o3][o4];[o4]alphaextract[alpha];[o3][alpha]alphamerge[out]"
-
 do_lavfi_pixfmts(){
     testname=$1;
     test ${test%_[bl]e} = $testname || return 0
diff --git a/tests/ref/fate/filter-alphaextract_alphamerge_rgb b/tests/ref/fate/filter-alphaextract_alphamerge_rgb
new file mode 100644 (file)
index 0000000..2d6ec46
--- /dev/null
@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   405504, 0xf685836e
+0,          1,          1,        1,   405504, 0x3c8529c4
+0,          2,          2,        1,   405504, 0xb1776a94
+0,          3,          3,        1,   405504, 0xe832f71d
+0,          4,          4,        1,   405504, 0x91fc06c1
+0,          5,          5,        1,   405504, 0x1e659bff
+0,          6,          6,        1,   405504, 0xbbc233a4
+0,          7,          7,        1,   405504, 0x25462ef2
+0,          8,          8,        1,   405504, 0x617d5da4
+0,          9,          9,        1,   405504, 0xddea0f0f
+0,         10,         10,        1,   405504, 0x109b8ebe
+0,         11,         11,        1,   405504, 0xe308df12
+0,         12,         12,        1,   405504, 0x8cb410d2
+0,         13,         13,        1,   405504, 0x9934005b
+0,         14,         14,        1,   405504, 0xd8acdbbc
+0,         15,         15,        1,   405504, 0x9d4b2ac6
+0,         16,         16,        1,   405504, 0x947ceac7
+0,         17,         17,        1,   405504, 0x07395451
+0,         18,         18,        1,   405504, 0x20019312
+0,         19,         19,        1,   405504, 0x83bb93f4
+0,         20,         20,        1,   405504, 0xd5f6fb19
+0,         21,         21,        1,   405504, 0x88d99b1b
+0,         22,         22,        1,   405504, 0x07945e3e
+0,         23,         23,        1,   405504, 0x8f9fc73e
+0,         24,         24,        1,   405504, 0x57c91b23
+0,         25,         25,        1,   405504, 0xaa178088
+0,         26,         26,        1,   405504, 0x791351b8
+0,         27,         27,        1,   405504, 0x4d3fb636
+0,         28,         28,        1,   405504, 0xdab282e8
+0,         29,         29,        1,   405504, 0x4f19325f
+0,         30,         30,        1,   405504, 0x166b63f8
+0,         31,         31,        1,   405504, 0x96094622
+0,         32,         32,        1,   405504, 0x5fe1e0c5
+0,         33,         33,        1,   405504, 0xe986314f
+0,         34,         34,        1,   405504, 0xb1de76cc
+0,         35,         35,        1,   405504, 0xce46050e
+0,         36,         36,        1,   405504, 0xb86507ab
+0,         37,         37,        1,   405504, 0x16c8d71c
+0,         38,         38,        1,   405504, 0x53db736e
+0,         39,         39,        1,   405504, 0x21c24b9e
+0,         40,         40,        1,   405504, 0xf8f37309
+0,         41,         41,        1,   405504, 0xdd609804
+0,         42,         42,        1,   405504, 0x4fad765e
+0,         43,         43,        1,   405504, 0x849bf799
+0,         44,         44,        1,   405504, 0xa95957de
+0,         45,         45,        1,   405504, 0x0e84f027
+0,         46,         46,        1,   405504, 0xf73e3cc4
+0,         47,         47,        1,   405504, 0xa11e0e18
+0,         48,         48,        1,   405504, 0xb2c2499e
+0,         49,         49,        1,   405504, 0x1c1abffa
diff --git a/tests/ref/fate/filter-alphaextract_alphamerge_yuv b/tests/ref/fate/filter-alphaextract_alphamerge_yuv
new file mode 100644 (file)
index 0000000..9285cef
--- /dev/null
@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   253440, 0x9022e010
+0,          1,          1,        1,   253440, 0x97dba833
+0,          2,          2,        1,   253440, 0x7f24bea0
+0,          3,          3,        1,   253440, 0x7cfd0cde
+0,          4,          4,        1,   253440, 0x14eda178
+0,          5,          5,        1,   253440, 0x7fe9349b
+0,          6,          6,        1,   253440, 0x4833e264
+0,          7,          7,        1,   253440, 0x350513b1
+0,          8,          8,        1,   253440, 0xd226079b
+0,          9,          9,        1,   253440, 0xced95e1a
+0,         10,         10,        1,   253440, 0xb8d4245d
+0,         11,         11,        1,   253440, 0x60ae8c55
+0,         12,         12,        1,   253440, 0x4edd6b42
+0,         13,         13,        1,   253440, 0x13fb471a
+0,         14,         14,        1,   253440, 0x2d8f1578
+0,         15,         15,        1,   253440, 0x1d16012b
+0,         16,         16,        1,   253440, 0x6c19b661
+0,         17,         17,        1,   253440, 0x402d916a
+0,         18,         18,        1,   253440, 0x1dd4a963
+0,         19,         19,        1,   253440, 0x221ee04d
+0,         20,         20,        1,   253440, 0xb069c690
+0,         21,         21,        1,   253440, 0xb5ef43fd
+0,         22,         22,        1,   253440, 0x602115eb
+0,         23,         23,        1,   253440, 0x1467aed9
+0,         24,         24,        1,   253440, 0x37680a1c
+0,         25,         25,        1,   253440, 0x3fa825d5
+0,         26,         26,        1,   253440, 0xfb0b654a
+0,         27,         27,        1,   253440, 0x0cea074b
+0,         28,         28,        1,   253440, 0xdb20b79a
+0,         29,         29,        1,   253440, 0xb08848f0
+0,         30,         30,        1,   253440, 0xa06d6774
+0,         31,         31,        1,   253440, 0x452d1ba3
+0,         32,         32,        1,   253440, 0x96bea378
+0,         33,         33,        1,   253440, 0x16b5a370
+0,         34,         34,        1,   253440, 0x433b9208
+0,         35,         35,        1,   253440, 0x1f475d36
+0,         36,         36,        1,   253440, 0x66dc3561
+0,         37,         37,        1,   253440, 0x7edadddd
+0,         38,         38,        1,   253440, 0xf6fc858a
+0,         39,         39,        1,   253440, 0xf1f369d8
+0,         40,         40,        1,   253440, 0x3877f958
+0,         41,         41,        1,   253440, 0x22ef4692
+0,         42,         42,        1,   253440, 0x6ff4614a
+0,         43,         43,        1,   253440, 0x49712513
+0,         44,         44,        1,   253440, 0x438213e5
+0,         45,         45,        1,   253440, 0x54da2895
+0,         46,         46,        1,   253440, 0xb478205e
+0,         47,         47,        1,   253440, 0xffcfe69a
+0,         48,         48,        1,   253440, 0x1639fafd
+0,         49,         49,        1,   253440, 0x59d18f46
diff --git a/tests/ref/lavfi/alphaextract_rgb b/tests/ref/lavfi/alphaextract_rgb
deleted file mode 100644 (file)
index d46b563..0000000
+++ /dev/null
@@ -1 +0,0 @@
-alphaextract_rgb    4a46df014912056534fcab2f45a02279
diff --git a/tests/ref/lavfi/alphaextract_yuv b/tests/ref/lavfi/alphaextract_yuv
deleted file mode 100644 (file)
index 32b9ab9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-alphaextract_yuv    591e2d45f96ecfa8cc326eb741456a79
diff --git a/tests/ref/lavfi/alphamerge_rgb b/tests/ref/lavfi/alphamerge_rgb
deleted file mode 100644 (file)
index d890fae..0000000
+++ /dev/null
@@ -1 +0,0 @@
-alphamerge_rgb      4a46df014912056534fcab2f45a02279
diff --git a/tests/ref/lavfi/alphamerge_yuv b/tests/ref/lavfi/alphamerge_yuv
deleted file mode 100644 (file)
index 2e58301..0000000
+++ /dev/null
@@ -1 +0,0 @@
-alphamerge_yuv      591e2d45f96ecfa8cc326eb741456a79