diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 18:48:48 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 18:49:41 +0100 |
commit | a486dec4fd8f2d461ebec5b2744844916c28d383 (patch) | |
tree | 321ade3e64fce959df1c005b57e0589ce99c9d43 /tests | |
parent | bc140fb568df9c8ae341bbb2026d3609b7e81d6b (diff) | |
parent | 874838dc6589d978611c89a40694a5074f892a76 (diff) | |
download | ffmpeg-a486dec4fd8f2d461ebec5b2744844916c28d383.tar.gz |
Merge commit '874838dc6589d978611c89a40694a5074f892a76'
* commit '874838dc6589d978611c89a40694a5074f892a76':
fate: add one select filter test
Conflicts:
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/fate/filter-video.mak | 4 | ||||
-rw-r--r-- | tests/filtergraphs/select-alternate | 1 | ||||
-rw-r--r-- | tests/ref/fate/filter-select-alternate | 26 |
3 files changed, 31 insertions, 0 deletions
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 963bbd72e4..2d9ad132a3 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -81,6 +81,10 @@ fate-filter-phase: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf phase FATE_FILTER_VSYNTH-$(CONFIG_SEPARATEFIELDS_FILTER) += fate-filter-separatefields fate-filter-separatefields: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf separatefields +FATE_FILTER_VSYNTH-$(CONFIG_SELECT_FILTER) += fate-filter-select-alternate +fate-filter-select-alternate: tests/data/filtergraphs/select-alternate +fate-filter-select-alternate: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(TARGET_PATH)/tests/data/filtergraphs/select-alternate + FATE_FILTER_VSYNTH-$(call ALLYES, SETPTS_FILTER SETTB_FILTER) += fate-filter-setpts fate-filter-setpts: tests/data/filtergraphs/setpts fate-filter-setpts: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(TARGET_PATH)/tests/data/filtergraphs/setpts diff --git a/tests/filtergraphs/select-alternate b/tests/filtergraphs/select-alternate new file mode 100644 index 0000000000..1302e4243f --- /dev/null +++ b/tests/filtergraphs/select-alternate @@ -0,0 +1 @@ +select=not(mod(n\,2)) diff --git a/tests/ref/fate/filter-select-alternate b/tests/ref/fate/filter-select-alternate new file mode 100644 index 0000000000..0776694278 --- /dev/null +++ b/tests/ref/fate/filter-select-alternate @@ -0,0 +1,26 @@ +#tb 0: 1/25 +0, 0, 0, 1, 152064, 0x05b789ef +0, 2, 2, 1, 152064, 0x9dddf64a +0, 4, 4, 1, 152064, 0x4de3b652 +0, 6, 6, 1, 152064, 0xe20f7c23 +0, 8, 8, 1, 152064, 0x1f1b8026 +0, 10, 10, 1, 152064, 0x02344760 +0, 12, 12, 1, 152064, 0xc711ad61 +0, 14, 14, 1, 152064, 0x52a48ddd +0, 16, 16, 1, 152064, 0x8e364e18 +0, 18, 18, 1, 152064, 0xf25f6acc +0, 20, 20, 1, 152064, 0xfc7bf570 +0, 22, 22, 1, 152064, 0x445d1d59 +0, 24, 24, 1, 152064, 0xce09f9d6 +0, 26, 26, 1, 152064, 0x43d796b5 +0, 28, 28, 1, 152064, 0x76d2a455 +0, 30, 30, 1, 152064, 0x0f9d6aca +0, 32, 32, 1, 152064, 0xd766fc8d +0, 34, 34, 1, 152064, 0x7fea4378 +0, 36, 36, 1, 152064, 0x4c9737ab +0, 38, 38, 1, 152064, 0x0b07594c +0, 40, 40, 1, 152064, 0xd2735925 +0, 42, 42, 1, 152064, 0x20cebfa9 +0, 44, 44, 1, 152064, 0xfd500471 +0, 46, 46, 1, 152064, 0x09ef53ff +0, 48, 48, 1, 152064, 0xbb87b483 |