From 3d8c80b611aa1e2f800dd9c8d8f350407f95c042 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 13 Mar 2013 11:03:08 +0100 Subject: [PATCH 1/4] FATE: add a test for the overlay filter --- tests/fate/filter.mak | 3 +++ tests/filtergraphs/overlay | 2 ++ tests/ref/fate/filter-overlay | 51 +++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 tests/filtergraphs/overlay create mode 100644 tests/ref/fate/filter-overlay diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index d07cdcba50..c753e248e5 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -49,6 +49,9 @@ fate-filter-gradfun: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf gradfun FATE_FILTER_VSYNTH-$(CONFIG_HQDN3D_FILTER) += fate-filter-hqdn3d fate-filter-hqdn3d: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf hqdn3d +FATE_FILTER_VSYNTH-$(CONFIG_OVERLAY_FILTER) += fate-filter-overlay +fate-filter-overlay: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay + FATE_FILTER_VSYNTH-$(call ALLYES, SETPTS_FILTER SETTB_FILTER) += fate-filter-setpts fate-filter-setpts: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(SRC_PATH)/tests/filtergraphs/setpts diff --git a/tests/filtergraphs/overlay b/tests/filtergraphs/overlay new file mode 100644 index 0000000000..d646463bfd --- /dev/null +++ b/tests/filtergraphs/overlay @@ -0,0 +1,2 @@ +[1:v] scale=50:50 [over]; +[0:v][over] overlay=20:20 diff --git a/tests/ref/fate/filter-overlay b/tests/ref/fate/filter-overlay new file mode 100644 index 0000000000..d988a2e4e1 --- /dev/null +++ b/tests/ref/fate/filter-overlay @@ -0,0 +1,51 @@ +#tb 0: 1/25 +0, 0, 0, 1, 152064, 0xf6f773b6 +0, 1, 1, 1, 152064, 0x8e67618e +0, 2, 2, 1, 152064, 0xc8eff2ef +0, 3, 3, 1, 152064, 0xcf39936c +0, 4, 4, 1, 152064, 0xaf18c4d1 +0, 5, 5, 1, 152064, 0x7e69911e +0, 6, 6, 1, 152064, 0x1b70214f +0, 7, 7, 1, 152064, 0xc8032176 +0, 8, 8, 1, 152064, 0xefb42ecc +0, 9, 9, 1, 152064, 0xfb210e4b +0, 10, 10, 1, 152064, 0x2ee24b11 +0, 11, 11, 1, 152064, 0x0dac02a5 +0, 12, 12, 1, 152064, 0x9a5ce483 +0, 13, 13, 1, 152064, 0x6bb7c758 +0, 14, 14, 1, 152064, 0xcbb545e5 +0, 15, 15, 1, 152064, 0x81c1b339 +0, 16, 16, 1, 152064, 0xfa38d624 +0, 17, 17, 1, 152064, 0x56c5e63e +0, 18, 18, 1, 152064, 0x419d194d +0, 19, 19, 1, 152064, 0xed1a92b8 +0, 20, 20, 1, 152064, 0xd2c0aa39 +0, 21, 21, 1, 152064, 0x6214ddd5 +0, 22, 22, 1, 152064, 0xa978e19f +0, 23, 23, 1, 152064, 0x676422a2 +0, 24, 24, 1, 152064, 0x5213dd62 +0, 25, 25, 1, 152064, 0x13c1a404 +0, 26, 26, 1, 152064, 0xa543a1a2 +0, 27, 27, 1, 152064, 0x8d0d0bed +0, 28, 28, 1, 152064, 0x000304cf +0, 29, 29, 1, 152064, 0x7f75b0ab +0, 30, 30, 1, 152064, 0x68d07ce6 +0, 31, 31, 1, 152064, 0xb88c9852 +0, 32, 32, 1, 152064, 0x4be5ae13 +0, 33, 33, 1, 152064, 0x85b3f7b1 +0, 34, 34, 1, 152064, 0x9facb7d5 +0, 35, 35, 1, 152064, 0x9f11617e +0, 36, 36, 1, 152064, 0x43393f46 +0, 37, 37, 1, 152064, 0xd45c3b92 +0, 38, 38, 1, 152064, 0x53de7e1b +0, 39, 39, 1, 152064, 0xd1c685a7 +0, 40, 40, 1, 152064, 0x21e1778f +0, 41, 41, 1, 152064, 0xe2b1abe1 +0, 42, 42, 1, 152064, 0x8623b5aa +0, 43, 43, 1, 152064, 0xfc700aa3 +0, 44, 44, 1, 152064, 0x30a2d120 +0, 45, 45, 1, 152064, 0xa35e4d15 +0, 46, 46, 1, 152064, 0xa3fb11c5 +0, 47, 47, 1, 152064, 0x034f8fb7 +0, 48, 48, 1, 152064, 0x921c7d85 +0, 49, 49, 1, 152064, 0x7a94b9bf From f917420378634708976f1638b282a34325d82cc6 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 13 Mar 2013 11:03:08 +0100 Subject: [PATCH 2/4] FATE: add a test for the negate filter --- tests/fate/filter.mak | 3 +++ tests/ref/fate/filter-negate | 51 ++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 tests/ref/fate/filter-negate diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index c753e248e5..120dc61d82 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -49,6 +49,9 @@ fate-filter-gradfun: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf gradfun FATE_FILTER_VSYNTH-$(CONFIG_HQDN3D_FILTER) += fate-filter-hqdn3d fate-filter-hqdn3d: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf hqdn3d +FATE_FILTER_VSYNTH-$(CONFIG_NEGATE_FILTER) += fate-filter-negate +fate-filter-negate: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf negate + FATE_FILTER_VSYNTH-$(CONFIG_OVERLAY_FILTER) += fate-filter-overlay fate-filter-overlay: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay diff --git a/tests/ref/fate/filter-negate b/tests/ref/fate/filter-negate new file mode 100644 index 0000000000..1d2ea73043 --- /dev/null +++ b/tests/ref/fate/filter-negate @@ -0,0 +1,51 @@ +#tb 0: 1/25 +0, 0, 0, 1, 152064, 0xef20e1ec +0, 1, 1, 1, 152064, 0x899606ec +0, 2, 2, 1, 152064, 0xaea175d2 +0, 3, 3, 1, 152064, 0x5201eb55 +0, 4, 4, 1, 152064, 0xf02bb525 +0, 5, 5, 1, 152064, 0x99fdc305 +0, 6, 6, 1, 152064, 0x3a8fefe7 +0, 7, 7, 1, 152064, 0x005edfbf +0, 8, 8, 1, 152064, 0xe37aea50 +0, 9, 9, 1, 152064, 0xa5ad32f9 +0, 10, 10, 1, 152064, 0xb1e52485 +0, 11, 11, 1, 152064, 0x55b06e56 +0, 12, 12, 1, 152064, 0xdfb7be97 +0, 13, 13, 1, 152064, 0x191bca13 +0, 14, 14, 1, 152064, 0xa554dd3c +0, 15, 15, 1, 152064, 0x36075b77 +0, 16, 16, 1, 152064, 0xbf6b1cbd +0, 17, 17, 1, 152064, 0xf33432b6 +0, 18, 18, 1, 152064, 0x5d7100c3 +0, 19, 19, 1, 152064, 0x376f8f0c +0, 20, 20, 1, 152064, 0x07ca75fa +0, 21, 21, 1, 152064, 0xe3984704 +0, 22, 22, 1, 152064, 0xa8fb4e4c +0, 23, 23, 1, 152064, 0xe8e102d8 +0, 24, 24, 1, 152064, 0xcc6771c9 +0, 25, 25, 1, 152064, 0xf646d238 +0, 26, 26, 1, 152064, 0xa52cd41e +0, 27, 27, 1, 152064, 0x536d92c2 +0, 28, 28, 1, 152064, 0x7058c6a1 +0, 29, 29, 1, 152064, 0xcc6c05d0 +0, 30, 30, 1, 152064, 0x1fc2ffb8 +0, 31, 31, 1, 152064, 0x041ea59c +0, 32, 32, 1, 152064, 0xfc006e07 +0, 33, 33, 1, 152064, 0x0246efe1 +0, 34, 34, 1, 152064, 0x079428e5 +0, 35, 35, 1, 152064, 0x64d9d773 +0, 36, 36, 1, 152064, 0x914d3454 +0, 37, 37, 1, 152064, 0xef69686e +0, 38, 38, 1, 152064, 0x3c91129f +0, 39, 39, 1, 152064, 0x2a611ca7 +0, 40, 40, 1, 152064, 0xaf56124f +0, 41, 41, 1, 152064, 0xce48cd45 +0, 42, 42, 1, 152064, 0x75feac29 +0, 43, 43, 1, 152064, 0xfd2b4b5b +0, 44, 44, 1, 152064, 0x8d2f675c +0, 45, 45, 1, 152064, 0x1573ed3b +0, 46, 46, 1, 152064, 0xb0fc17ca +0, 47, 47, 1, 152064, 0x53e5a654 +0, 48, 48, 1, 152064, 0xe0cbb786 +0, 49, 49, 1, 152064, 0xcaa092fe From 33942b7bdedaf0c7017f84245f4928860319a584 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 13 Mar 2013 11:03:08 +0100 Subject: [PATCH 3/4] FATE: add a test for the channelmap filter --- tests/fate/filter.mak | 7 +++++++ tests/filtergraphs/channelmap | 1 + 2 files changed, 8 insertions(+) create mode 100644 tests/filtergraphs/channelmap diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index 120dc61d82..89a1140350 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -33,6 +33,13 @@ fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm FATE_FILTER_VSYNTH-$(CONFIG_BOXBLUR_FILTER) += fate-filter-boxblur fate-filter-boxblur: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf boxblur=2:1 +FATE_FILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-channelmap +fate-filter-channelmap: SRC = $(TARGET_PATH)/tests/data/asynth-44100-6.wav +fate-filter-channelmap: tests/data/asynth-44100-6.wav +fate-filter-channelmap: CMD = md5 -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/channelmap -f wav -flags +bitexact +fate-filter-channelmap: CMP = oneline +fate-filter-channelmap: REF = 21f1977c4f9705e2057083f84764e685 + fate-filter-delogo: CMD = framecrc -i $(SAMPLES)/real/rv30.rm -vf delogo=show=0:x=290:y=25:w=26:h=16 -an FATE_FILTER-$(call FILTERDEMDEC, DELOGO, RM, RV30) += fate-filter-delogo diff --git a/tests/filtergraphs/channelmap b/tests/filtergraphs/channelmap new file mode 100644 index 0000000000..7f9f24d178 --- /dev/null +++ b/tests/filtergraphs/channelmap @@ -0,0 +1 @@ +channelmap=map=1\,2\,0\,5\,3\,4:channel_layout=5.1 From 43a8333a16c796b3d855fb3aaa742103cb62731f Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 13 Mar 2013 11:03:08 +0100 Subject: [PATCH 4/4] FATE: add a test for the channelsplit filter --- tests/fate/filter.mak | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index 89a1140350..1d7d06d22d 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -40,6 +40,13 @@ fate-filter-channelmap: CMD = md5 -i $(SRC) -filter_complex_script $(SRC_PATH)/t fate-filter-channelmap: CMP = oneline fate-filter-channelmap: REF = 21f1977c4f9705e2057083f84764e685 +FATE_FILTER-$(call FILTERDEMDECENCMUX, CHANNELSPLIT, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-channelsplit +fate-filter-channelsplit: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav +fate-filter-channelsplit: tests/data/asynth-44100-2.wav +fate-filter-channelsplit: CMD = md5 -i $(SRC) -filter_complex channelsplit -f s16le +fate-filter-channelsplit: CMP = oneline +fate-filter-channelsplit: REF = d92988d0fe2dd92236763f47b07ab597 + fate-filter-delogo: CMD = framecrc -i $(SAMPLES)/real/rv30.rm -vf delogo=show=0:x=290:y=25:w=26:h=16 -an FATE_FILTER-$(call FILTERDEMDEC, DELOGO, RM, RV30) += fate-filter-delogo