aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-05-31 21:02:38 -0700
committerMichael Niedermayer <michaelni@gmx.at>2014-06-02 04:12:10 +0200
commit22d1b2498228ee1c39a6d9750b7c0be65c08cc8b (patch)
treefee6902c1ac4e4b46dabdbadabf857422b8b319e
parent44a7299139e50636c83d7d67e7c1e571e80e7917 (diff)
downloadffmpeg-22d1b2498228ee1c39a6d9750b7c0be65c08cc8b.tar.gz
tests: Replace fieldmatch test with pixfmt
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--tests/fate/filter-video.mak6
-rw-r--r--tests/ref/fate/filter-fieldmatch63
-rw-r--r--tests/ref/fate/filter-pixfmts-fieldmatch5
3 files changed, 8 insertions, 66 deletions
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index b3b2518433..42cac4e408 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@ -41,9 +41,6 @@ fate-filter-drawbox: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf drawbox=224:24:88:
FATE_FILTER_VSYNTH-$(CONFIG_FADE_FILTER) += fate-filter-fade
fate-filter-fade: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf fade=in:5:15,fade=out:30:15
-FATE_FILTER_VSYNTH-$(call ALLYES, TELECINE_FILTER FIELDMATCH_FILTER) += fate-filter-fieldmatch
-fate-filter-fieldmatch: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf telecine,fieldmatch
-
FATE_FILTER_VSYNTH-$(call ALLYES, INTERLACE_FILTER FIELDORDER_FILTER) += fate-filter-fieldorder
fate-filter-fieldorder: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf interlace=tff,fieldorder=bff -sws_flags +accurate_rnd+bitexact
@@ -276,6 +273,9 @@ fate-filter-pixfmts-crop: CMD = pixfmts "100:100:100:100"
FATE_FILTER_PIXFMTS-$(CONFIG_FIELD_FILTER) += fate-filter-pixfmts-field
fate-filter-pixfmts-field: CMD = pixfmts "bottom"
+FATE_FILTER_PIXFMTS-$(call ALLYES, TELECINE_FILTER FIELDMATCH_FILTER) += fate-filter-pixfmts-fieldmatch
+fate-filter-pixfmts-fieldmatch: CMD = pixfmts "" "telecine,"
+
FATE_FILTER_PIXFMTS-$(CONFIG_FIELDORDER_FILTER) += fate-filter-pixfmts-fieldorder
fate-filter-pixfmts-fieldorder: CMD = pixfmts "tff" "setfield=bff,"
diff --git a/tests/ref/fate/filter-fieldmatch b/tests/ref/fate/filter-fieldmatch
deleted file mode 100644
index 1b11a86b38..0000000000
--- a/tests/ref/fate/filter-fieldmatch
+++ /dev/null
@@ -1,63 +0,0 @@
-#tb 0: 4/125
-0, 0, 0, 1, 152064, 0x4bb46551
-0, 1, 1, 1, 152064, 0x40692c80
-0, 2, 2, 1, 152064, 0xd7ad04cb
-0, 3, 3, 1, 152064, 0xd7ad04cb
-0, 4, 4, 1, 152064, 0x2a8380b0
-0, 5, 5, 1, 152064, 0xedb5a8e6
-0, 6, 6, 1, 152064, 0x549dfa8a
-0, 7, 7, 1, 152064, 0x447bc7b9
-0, 8, 8, 1, 152064, 0x447bc7b9
-0, 9, 9, 1, 152064, 0x5ab58bac
-0, 10, 10, 1, 152064, 0x91373915
-0, 11, 11, 1, 152064, 0x90895a6e
-0, 12, 12, 1, 152064, 0x793d075e
-0, 13, 13, 1, 152064, 0x793d075e
-0, 14, 14, 1, 152064, 0x30f5fcd5
-0, 15, 15, 1, 152064, 0x24eca223
-0, 16, 16, 1, 152064, 0x0a4073dc
-0, 17, 17, 1, 152064, 0x06e34d70
-0, 18, 18, 1, 152064, 0x06e34d70
-0, 19, 19, 1, 152064, 0xa91c0f05
-0, 20, 20, 1, 152064, 0xb15d38c8
-0, 21, 21, 1, 152064, 0x6b2b2e46
-0, 22, 22, 1, 152064, 0xbd2320cb
-0, 23, 23, 1, 152064, 0xbd2320cb
-0, 24, 24, 1, 152064, 0xf34ddbff
-0, 25, 25, 1, 152064, 0x9dc72412
-0, 26, 26, 1, 152064, 0xa1242020
-0, 27, 27, 1, 152064, 0x1f939e6a
-0, 28, 28, 1, 152064, 0x1f939e6a
-0, 29, 29, 1, 152064, 0x2f2768ef
-0, 30, 30, 1, 152064, 0x95579936
-0, 31, 31, 1, 152064, 0x41181cbd
-0, 32, 32, 1, 152064, 0xe9cec847
-0, 33, 33, 1, 152064, 0xe9cec847
-0, 34, 34, 1, 152064, 0xd780d887
-0, 35, 35, 1, 152064, 0x6dc3650e
-0, 36, 36, 1, 152064, 0x8d165d23
-0, 37, 37, 1, 152064, 0x64f10efa
-0, 38, 38, 1, 152064, 0x64f10efa
-0, 39, 39, 1, 152064, 0xe295c51e
-0, 40, 40, 1, 152064, 0xe22f7a30
-0, 41, 41, 1, 152064, 0xd8c68892
-0, 42, 42, 1, 152064, 0x26516b0e
-0, 43, 43, 1, 152064, 0x26516b0e
-0, 44, 44, 1, 152064, 0xfa8d94fb
-0, 45, 45, 1, 152064, 0xa50d01f8
-0, 46, 46, 1, 152064, 0x82f12165
-0, 47, 47, 1, 152064, 0x113fadc0
-0, 48, 48, 1, 152064, 0x113fadc0
-0, 49, 49, 1, 152064, 0x88734edd
-0, 50, 50, 1, 152064, 0xd4e49e08
-0, 51, 51, 1, 152064, 0x8cd54fc5
-0, 52, 52, 1, 152064, 0xae821cac
-0, 53, 53, 1, 152064, 0xae821cac
-0, 54, 54, 1, 152064, 0x575c20ec
-0, 55, 55, 1, 152064, 0x61b47e73
-0, 56, 56, 1, 152064, 0x213d5314
-0, 57, 57, 1, 152064, 0xb4ddd391
-0, 58, 58, 1, 152064, 0xb4ddd391
-0, 59, 59, 1, 152064, 0x6e88c5c2
-0, 60, 60, 1, 152064, 0x4bbad8ea
-0, 61, 61, 1, 152064, 0x4bbad8ea
diff --git a/tests/ref/fate/filter-pixfmts-fieldmatch b/tests/ref/fate/filter-pixfmts-fieldmatch
new file mode 100644
index 0000000000..22d554903f
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-fieldmatch
@@ -0,0 +1,5 @@
+yuv410p 08518d1ceaf740696b26eb89325987c1
+yuv411p ca4b3b96c4f487fc293ad8d631f37660
+yuv420p 2069df6ae54ce80f82d591ac753e66cc
+yuv422p 7b4fe261becce67a0eeeea0b6886d9f6
+yuv444p 5a0ca602480a00e662017c2ecdfc4e1c