aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-28 13:23:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-28 13:48:05 +0100
commit6f1a6a9f6ba0528ac5f77c181b715f9c3fa098e9 (patch)
tree7cafea337f80f7bdbbba38bf641640fb00acfbae
parentac1a1fd7088ca903ff3c568612d6a7c2126772a9 (diff)
parent1a6d4bd7b60761bd7d955011ce7df4dd6b87b497 (diff)
downloadffmpeg-6f1a6a9f6ba0528ac5f77c181b715f9c3fa098e9.tar.gz
Merge commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497'
* commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497': FATE: add a test for the fade filter FATE: add a test for the drawbox filter FATE: add a test for the boxblur filter FATE: add a test for the gradfun filter Conflicts: tests/fate/filter.mak tests/ref/fate/filter-gradfun our gradfun test is renamed to gradfun-ubitux as its name conflicts and it was requested to be kept. Feel free to rename, change, finetune ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--tests/fate/filter.mak22
-rw-r--r--tests/ref/fate/filter-boxblur51
-rw-r--r--tests/ref/fate/filter-drawbox51
-rw-r--r--tests/ref/fate/filter-fade51
-rw-r--r--tests/ref/fate/filter-gradfun72
-rw-r--r--tests/ref/fate/filter-gradfun-ubitux21
6 files changed, 244 insertions, 24 deletions
diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak
index 46ff5c1450..753db3ff33 100644
--- a/tests/fate/filter.mak
+++ b/tests/fate/filter.mak
@@ -36,10 +36,22 @@ fate-filter-aresample: CMD = pcm -i $(SRC) -af aresample=min_comp=0.001:min_hard
fate-filter-aresample: CMP = oneoff
fate-filter-aresample: 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-delogo: CMD = framecrc -i $(SAMPLES)/real/rv30.rm -vf perms=random,delogo=show=0:x=290:y=25:w=26:h=16 -an
FATE_FILTER-$(call ALLYES, PERMS_FILTER DELOGO_FILTER RM_DEMUXER RV30_DECODER) += fate-filter-delogo
+FATE_FILTER_VSYNTH-$(CONFIG_DRAWBOX_FILTER) += fate-filter-drawbox
+fate-filter-drawbox: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf drawbox=10:20:200:60:red@0.5
+
+FATE_FILTER_VSYNTH-$(CONFIG_FADE_FILTER) += fate-filter-fade
+fate-filter-fade: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf fade=in:0:25,fade=out:25:25
+
+FATE_FILTER_VSYNTH-$(CONFIG_GRADFUN_FILTER) += fate-filter-gradfun
+fate-filter-gradfun: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf gradfun
+
FATE_YADIF += fate-filter-yadif-mode0
fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vframes 30 -vf yadif=0
@@ -55,13 +67,17 @@ FATE_FILTER-$(call ALLYES, SMJPEG_DEMUXER MJPEG_DECODER PERMS_FILTER HQDN3D_FILT
fate-filter-curves: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_median.avi -vf perms=random,curves=vintage
FATE_FILTER-$(call ALLYES, UTVIDEO_DECODER AVI_DEMUXER PERMS_FILTER CURVES_FILTER) += fate-filter-curves
-FATE_GRADFUN += fate-filter-gradfun
-fate-filter-gradfun: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vf "sws_flags=+accurate_rnd+bitexact;format=gray,perms=random,gradfun=10:8" -an -frames:v 20
+FATE_GRADFUN += fate-filter-gradfun-ubitux
+fate-filter-gradfun-ubitux: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vf "sws_flags=+accurate_rnd+bitexact;format=gray,perms=random,gradfun=10:8" -an -frames:v 20
FATE_FILTER-$(call ALLYES, VMD_DEMUXER VMDVIDEO_DECODER FORMAT_FILTER PERMS_FILTER GRADFUN_FILTER) += $(FATE_GRADFUN)
fate-filter-concat: CMD = framecrc -lavfi "testsrc=r=5:n=1:d=2[v1];sine=440:b=2:d=1[a1];testsrc=r=5:n=1:d=1[v2];sine=622:b=2:d=2[a2];testsrc=r=5:n=1:d=1[v3];sine=880:b=2:d=1[a3];[v1][a1][v2][a2][v3][a3]concat=v=1:a=1:n=3"
FATE_FILTER-$(call ALLYES, TESTSRC_FILTER SINE_FILTER CONCAT_FILTER) += fate-filter-concat
+$(FATE_FILTER_VSYNTH-yes): tests/vsynth1/00.pgm
+$(FATE_FILTER_VSYNTH-yes): SRC = $(TARGET_PATH)/tests/vsynth1/%02d.pgm
+FATE_AVCONV-$(call DEMDEC, IMAGE2, PGMYUV) += $(FATE_FILTER_VSYNTH-yes)
+
FATE_SAMPLES_AVCONV += $(FATE_FILTER-yes)
#
@@ -87,4 +103,4 @@ fate-filter-metadata-ebur128: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SR
FATE_SAMPLES_FFPROBE += $(FATE_METADATA_FILTER-yes)
-fate-filter: $(FATE_FILTER-yes) $(FATE_METADATA_FILTER-yes)
+fate-filter: $(FATE_FILTER-yes) $(FATE_FILTER_VSYNTH-yes) $(FATE_METADATA_FILTER-yes)
diff --git a/tests/ref/fate/filter-boxblur b/tests/ref/fate/filter-boxblur
new file mode 100644
index 0000000000..acb2beb022
--- /dev/null
+++ b/tests/ref/fate/filter-boxblur
@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0, 0, 0, 1, 152064, 0x113489f8
+0, 1, 1, 1, 152064, 0x650a64ca
+0, 2, 2, 1, 152064, 0x29ecf6b1
+0, 3, 3, 1, 152064, 0x5cb98169
+0, 4, 4, 1, 152064, 0x4f46b6d7
+0, 5, 5, 1, 152064, 0x793ba919
+0, 6, 6, 1, 152064, 0x6caf7c14
+0, 7, 7, 1, 152064, 0xca638b2e
+0, 8, 8, 1, 152064, 0xf6df803d
+0, 9, 9, 1, 152064, 0x907b386f
+0, 10, 10, 1, 152064, 0xbb8d47f9
+0, 11, 11, 1, 152064, 0x17befd28
+0, 12, 12, 1, 152064, 0xf29eae1e
+0, 13, 13, 1, 152064, 0xb08ba1e6
+0, 14, 14, 1, 152064, 0x39948df7
+0, 15, 15, 1, 152064, 0x841d0e7e
+0, 16, 16, 1, 152064, 0x21d64dd6
+0, 17, 17, 1, 152064, 0x18af38e9
+0, 18, 18, 1, 152064, 0x1f946a26
+0, 19, 19, 1, 152064, 0x0d9cdc4e
+0, 20, 20, 1, 152064, 0xaf2af54d
+0, 21, 21, 1, 152064, 0x09e724e1
+0, 22, 22, 1, 152064, 0xff7d1e4b
+0, 23, 23, 1, 152064, 0xd49d68ad
+0, 24, 24, 1, 152064, 0x7ea4f96b
+0, 25, 25, 1, 152064, 0xd2f698b9
+0, 26, 26, 1, 152064, 0xc2a696ac
+0, 27, 27, 1, 152064, 0x1e8ed7b4
+0, 28, 28, 1, 152064, 0x980ba498
+0, 29, 29, 1, 152064, 0x47c364f2
+0, 30, 30, 1, 152064, 0x1a196ada
+0, 31, 31, 1, 152064, 0x4847c564
+0, 32, 32, 1, 152064, 0xa959fc15
+0, 33, 33, 1, 152064, 0x7d1a79d3
+0, 34, 34, 1, 152064, 0xae7e438d
+0, 35, 35, 1, 152064, 0xc32794b4
+0, 36, 36, 1, 152064, 0x6ef43744
+0, 37, 37, 1, 152064, 0xa06a01d0
+0, 38, 38, 1, 152064, 0xc94b5847
+0, 39, 39, 1, 152064, 0xb7514f04
+0, 40, 40, 1, 152064, 0xf0c959e8
+0, 41, 41, 1, 152064, 0xe6439e5e
+0, 42, 42, 1, 152064, 0xd347bf8d
+0, 43, 43, 1, 152064, 0x40822107
+0, 44, 44, 1, 152064, 0xe0ad044a
+0, 45, 45, 1, 152064, 0x05f77e73
+0, 46, 46, 1, 152064, 0xbeaa536d
+0, 47, 47, 1, 152064, 0xb0edc576
+0, 48, 48, 1, 152064, 0x35fcb4fa
+0, 49, 49, 1, 152064, 0x8d9ad8fa
diff --git a/tests/ref/fate/filter-drawbox b/tests/ref/fate/filter-drawbox
new file mode 100644
index 0000000000..869b9f32b0
--- /dev/null
+++ b/tests/ref/fate/filter-drawbox
@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0, 0, 0, 1, 152064, 0x7eee5ca3
+0, 1, 1, 1, 152064, 0x61125759
+0, 2, 2, 1, 152064, 0x2a64f47f
+0, 3, 3, 1, 152064, 0xc1089594
+0, 4, 4, 1, 152064, 0xd9e18830
+0, 5, 5, 1, 152064, 0xeb135e03
+0, 6, 6, 1, 152064, 0x6a5b40d7
+0, 7, 7, 1, 152064, 0x0a356a16
+0, 8, 8, 1, 152064, 0xfc1d7858
+0, 9, 9, 1, 152064, 0xa04bfeb8
+0, 10, 10, 1, 152064, 0x2d952ef0
+0, 11, 11, 1, 152064, 0x7f360233
+0, 12, 12, 1, 152064, 0xdd2bd142
+0, 13, 13, 1, 152064, 0xd231ad4a
+0, 14, 14, 1, 152064, 0x0543400e
+0, 15, 15, 1, 152064, 0x8252be2b
+0, 16, 16, 1, 152064, 0xd9f702be
+0, 17, 17, 1, 152064, 0xed5cf787
+0, 18, 18, 1, 152064, 0xf9472f8e
+0, 19, 19, 1, 152064, 0x89e4a60b
+0, 20, 20, 1, 152064, 0x1f12c1f5
+0, 21, 21, 1, 152064, 0x76eaf390
+0, 22, 22, 1, 152064, 0x60b5eba3
+0, 23, 23, 1, 152064, 0xf09e348c
+0, 24, 24, 1, 152064, 0x1afabf8a
+0, 25, 25, 1, 152064, 0xd16c558e
+0, 26, 26, 1, 152064, 0x78634796
+0, 27, 27, 1, 152064, 0xcd13b1e3
+0, 28, 28, 1, 152064, 0x59c2c6e5
+0, 29, 29, 1, 152064, 0x265e6beb
+0, 30, 30, 1, 152064, 0x82c656af
+0, 31, 31, 1, 152064, 0x919e923c
+0, 32, 32, 1, 152064, 0xc428fc15
+0, 33, 33, 1, 152064, 0x488760cd
+0, 34, 34, 1, 152064, 0x0a080c93
+0, 35, 35, 1, 152064, 0xaab649e6
+0, 36, 36, 1, 152064, 0x9b34edaa
+0, 37, 37, 1, 152064, 0x44e12816
+0, 38, 38, 1, 152064, 0x03777927
+0, 39, 39, 1, 152064, 0x6644573e
+0, 40, 40, 1, 152064, 0x18574df7
+0, 41, 41, 1, 152064, 0x5dce82f6
+0, 42, 42, 1, 152064, 0xb8be9205
+0, 43, 43, 1, 152064, 0xb927eacb
+0, 44, 44, 1, 152064, 0x303ec874
+0, 45, 45, 1, 152064, 0x05eb3c6f
+0, 46, 46, 1, 152064, 0x74a614d6
+0, 47, 47, 1, 152064, 0x6d078969
+0, 48, 48, 1, 152064, 0xe57a7ae0
+0, 49, 49, 1, 152064, 0xd6fca9ec
diff --git a/tests/ref/fate/filter-fade b/tests/ref/fate/filter-fade
new file mode 100644
index 0000000000..3acd889e39
--- /dev/null
+++ b/tests/ref/fate/filter-fade
@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0, 0, 0, 1, 152064, 0xb4e6c735
+0, 1, 1, 1, 152064, 0xbfa36592
+0, 2, 2, 1, 152064, 0x8678003e
+0, 3, 3, 1, 152064, 0xb1e9b1a3
+0, 4, 4, 1, 152064, 0x6ccf66ac
+0, 5, 5, 1, 152064, 0x3390056b
+0, 6, 6, 1, 152064, 0x4fcae508
+0, 7, 7, 1, 152064, 0x2528a210
+0, 8, 8, 1, 152064, 0x8128070e
+0, 9, 9, 1, 152064, 0xc991f27d
+0, 10, 10, 1, 152064, 0xe97a9a8b
+0, 11, 11, 1, 152064, 0x71cb32fb
+0, 12, 12, 1, 152064, 0x0b395f46
+0, 13, 13, 1, 152064, 0x362c1742
+0, 14, 14, 1, 152064, 0x14d23d11
+0, 15, 15, 1, 152064, 0x4d11a4d6
+0, 16, 16, 1, 152064, 0xee808ebb
+0, 17, 17, 1, 152064, 0x1d69964c
+0, 18, 18, 1, 152064, 0xfd5c30e6
+0, 19, 19, 1, 152064, 0xcd69b313
+0, 20, 20, 1, 152064, 0x3d75953b
+0, 21, 21, 1, 152064, 0xd6c698ea
+0, 22, 22, 1, 152064, 0x25006f22
+0, 23, 23, 1, 152064, 0x44e6a8a7
+0, 24, 24, 1, 152064, 0x0c251d62
+0, 25, 25, 1, 152064, 0x95579936
+0, 26, 26, 1, 152064, 0x8156c4f5
+0, 27, 27, 1, 152064, 0xca743348
+0, 28, 28, 1, 152064, 0x56a1373d
+0, 29, 29, 1, 152064, 0x17360ed3
+0, 30, 30, 1, 152064, 0x245243a1
+0, 31, 31, 1, 152064, 0xdd5ff4df
+0, 32, 32, 1, 152064, 0x2b979f45
+0, 33, 33, 1, 152064, 0x8a74da27
+0, 34, 34, 1, 152064, 0x27a7cd9f
+0, 35, 35, 1, 152064, 0xaa543c0f
+0, 36, 36, 1, 152064, 0xd72b5d8a
+0, 37, 37, 1, 152064, 0x8538f93d
+0, 38, 38, 1, 152064, 0x3fdc67b7
+0, 39, 39, 1, 152064, 0x4fe2154f
+0, 40, 40, 1, 152064, 0x908e09fb
+0, 41, 41, 1, 152064, 0x75ca5951
+0, 42, 42, 1, 152064, 0xd4a2ef14
+0, 43, 43, 1, 152064, 0x32d343a7
+0, 44, 44, 1, 152064, 0x59733ac8
+0, 45, 45, 1, 152064, 0x268d64da
+0, 46, 46, 1, 152064, 0x813eaf95
+0, 47, 47, 1, 152064, 0xf098ff5b
+0, 48, 48, 1, 152064, 0xc5b85c26
+0, 49, 49, 1, 152064, 0xc0f79718
diff --git a/tests/ref/fate/filter-gradfun b/tests/ref/fate/filter-gradfun
index dca442f2f3..794fae93e0 100644
--- a/tests/ref/fate/filter-gradfun
+++ b/tests/ref/fate/filter-gradfun
@@ -1,21 +1,51 @@
-#tb 0: 1/10
-0, 0, 0, 1, 76800, 0xc87b6728
-0, 1, 1, 1, 76800, 0xb0b24bc8
-0, 2, 2, 1, 76800, 0x45a22d68
-0, 3, 3, 1, 76800, 0x1821013b
-0, 4, 4, 1, 76800, 0xfb17dc4f
-0, 5, 5, 1, 76800, 0x8e7eb458
-0, 6, 6, 1, 76800, 0x0df37d02
-0, 7, 7, 1, 76800, 0x18e4500d
-0, 8, 8, 1, 76800, 0x639316b0
-0, 9, 9, 1, 76800, 0xce00e560
-0, 10, 10, 1, 76800, 0xd533b42c
-0, 11, 11, 1, 76800, 0x0772794c
-0, 12, 12, 1, 76800, 0x99544be0
-0, 13, 13, 1, 76800, 0x5f1a16c1
-0, 14, 14, 1, 76800, 0x90bfe8ac
-0, 15, 15, 1, 76800, 0xbd9bb834
-0, 16, 16, 1, 76800, 0x658d8053
-0, 17, 17, 1, 76800, 0x21cc5656
-0, 18, 18, 1, 76800, 0x6d39208b
-0, 19, 19, 1, 76800, 0x17b0f8cb
+#tb 0: 1/25
+0, 0, 0, 1, 152064, 0xaebf898f
+0, 1, 1, 1, 152064, 0x217b6560
+0, 2, 2, 1, 152064, 0x0269f62d
+0, 3, 3, 1, 152064, 0x12168087
+0, 4, 4, 1, 152064, 0x42f9b5fb
+0, 5, 5, 1, 152064, 0xa653a8b3
+0, 6, 6, 1, 152064, 0x2e317bc3
+0, 7, 7, 1, 152064, 0xf3c28b63
+0, 8, 8, 1, 152064, 0x12e57fce
+0, 9, 9, 1, 152064, 0xeac238dd
+0, 10, 10, 1, 152064, 0x8fe74772
+0, 11, 11, 1, 152064, 0x982afc9c
+0, 12, 12, 1, 152064, 0xd82ead51
+0, 13, 13, 1, 152064, 0xf83ca211
+0, 14, 14, 1, 152064, 0xc01f8de2
+0, 15, 15, 1, 152064, 0x7ec60ec6
+0, 16, 16, 1, 152064, 0x1beb4dd3
+0, 17, 17, 1, 152064, 0x5a513899
+0, 18, 18, 1, 152064, 0x8c766a7b
+0, 19, 19, 1, 152064, 0x8bcddbb0
+0, 20, 20, 1, 152064, 0x01f6f558
+0, 21, 21, 1, 152064, 0xac7e240f
+0, 22, 22, 1, 152064, 0xe8811d38
+0, 23, 23, 1, 152064, 0x4ea268c9
+0, 24, 24, 1, 152064, 0xadc5f950
+0, 25, 25, 1, 152064, 0xdbf498fb
+0, 26, 26, 1, 152064, 0x1b999678
+0, 27, 27, 1, 152064, 0x085dd810
+0, 28, 28, 1, 152064, 0x4665a44f
+0, 29, 29, 1, 152064, 0x674764cf
+0, 30, 30, 1, 152064, 0x65e96a72
+0, 31, 31, 1, 152064, 0x44e0c539
+0, 32, 32, 1, 152064, 0xb124fc9e
+0, 33, 33, 1, 152064, 0x5cff79e3
+0, 34, 34, 1, 152064, 0x7dd94359
+0, 35, 35, 1, 152064, 0x3ec294b6
+0, 36, 36, 1, 152064, 0x675d3767
+0, 37, 37, 1, 152064, 0x9efa01cb
+0, 38, 38, 1, 152064, 0x321058d2
+0, 39, 39, 1, 152064, 0xe0d04e9c
+0, 40, 40, 1, 152064, 0xa4dd58d4
+0, 41, 41, 1, 152064, 0x4cc19dc5
+0, 42, 42, 1, 152064, 0x30a1bf77
+0, 43, 43, 1, 152064, 0x2c9d20f2
+0, 44, 44, 1, 152064, 0x55cb0447
+0, 45, 45, 1, 152064, 0x4daa7e4f
+0, 46, 46, 1, 152064, 0x2a4f53c7
+0, 47, 47, 1, 152064, 0x9fb8c583
+0, 48, 48, 1, 152064, 0x072eb401
+0, 49, 49, 1, 152064, 0xa203d8b7
diff --git a/tests/ref/fate/filter-gradfun-ubitux b/tests/ref/fate/filter-gradfun-ubitux
new file mode 100644
index 0000000000..dca442f2f3
--- /dev/null
+++ b/tests/ref/fate/filter-gradfun-ubitux
@@ -0,0 +1,21 @@
+#tb 0: 1/10
+0, 0, 0, 1, 76800, 0xc87b6728
+0, 1, 1, 1, 76800, 0xb0b24bc8
+0, 2, 2, 1, 76800, 0x45a22d68
+0, 3, 3, 1, 76800, 0x1821013b
+0, 4, 4, 1, 76800, 0xfb17dc4f
+0, 5, 5, 1, 76800, 0x8e7eb458
+0, 6, 6, 1, 76800, 0x0df37d02
+0, 7, 7, 1, 76800, 0x18e4500d
+0, 8, 8, 1, 76800, 0x639316b0
+0, 9, 9, 1, 76800, 0xce00e560
+0, 10, 10, 1, 76800, 0xd533b42c
+0, 11, 11, 1, 76800, 0x0772794c
+0, 12, 12, 1, 76800, 0x99544be0
+0, 13, 13, 1, 76800, 0x5f1a16c1
+0, 14, 14, 1, 76800, 0x90bfe8ac
+0, 15, 15, 1, 76800, 0xbd9bb834
+0, 16, 16, 1, 76800, 0x658d8053
+0, 17, 17, 1, 76800, 0x21cc5656
+0, 18, 18, 1, 76800, 0x6d39208b
+0, 19, 19, 1, 76800, 0x17b0f8cb
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 00:53:47 +0000