[FFmpeg-cvslog] fate: restore our settings for drawtext/fade/unsharp.
Clément Bœsch
git at videolan.org
Mon Apr 29 20:03:07 CEST 2013
ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Mon Apr 29 19:52:23 2013 +0200| [80bcbed1574712396782e6f79698d364ade4ba63] | committer: Clément Bœsch
fate: restore our settings for drawtext/fade/unsharp.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80bcbed1574712396782e6f79698d364ade4ba63
---
tests/fate/filter-video.mak | 6 +--
tests/ref/fate/filter-drawbox | 100 ++++++++++++++++++++---------------------
tests/ref/fate/filter-fade | 96 +++++++++++++++++++--------------------
tests/ref/fate/filter-unsharp | 100 ++++++++++++++++++++---------------------
4 files changed, 151 insertions(+), 151 deletions(-)
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index 619e1d3..1e1c7f7 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@ -16,10 +16,10 @@ 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_VSYNTH-$(CONFIG_DRAWBOX_FILTER) += fate-filter-drawbox
-fate-filter-drawbox: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf drawbox=10:20:200:60:red at 0.5
+fate-filter-drawbox: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf drawbox=224:24:88:72:#FF8010 at 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-fade: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf fade=in:5:15,fade=out:30:15
FATE_FILTER_VSYNTH-$(CONFIG_GRADFUN_FILTER) += fate-filter-gradfun
fate-filter-gradfun: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf gradfun
@@ -58,7 +58,7 @@ FATE_FILTER_VSYNTH-$(CONFIG_TRANSPOSE_FILTER) += fate-filter-transpose
fate-filter-transpose: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf transpose
FATE_FILTER_VSYNTH-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp
-fate-filter-unsharp: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf unsharp
+fate-filter-unsharp: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf unsharp=11:11:-1.5:11:11:-1.5
FATE_FILTER-$(call ALLYES, SMJPEG_DEMUXER MJPEG_DECODER PERMS_FILTER HQDN3D_FILTER) += fate-filter-hqdn3d-sample
fate-filter-hqdn3d-sample: CMD = framecrc -idct simple -i $(SAMPLES)/smjpeg/scenwin.mjpg -vf perms=random,hqdn3d -an
diff --git a/tests/ref/fate/filter-drawbox b/tests/ref/fate/filter-drawbox
index 869b9f3..cb958f3 100644
--- a/tests/ref/fate/filter-drawbox
+++ b/tests/ref/fate/filter-drawbox
@@ -1,51 +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
+0, 0, 0, 1, 152064, 0x551c2cb9
+0, 1, 1, 1, 152064, 0xe3851051
+0, 2, 2, 1, 152064, 0xdfedad09
+0, 3, 3, 1, 152064, 0x519d4808
+0, 4, 4, 1, 152064, 0x2b9c4033
+0, 5, 5, 1, 152064, 0x5bf2f424
+0, 6, 6, 1, 152064, 0x8e8198cc
+0, 7, 7, 1, 152064, 0xfc12bc28
+0, 8, 8, 1, 152064, 0xffcac948
+0, 9, 9, 1, 152064, 0x0b2aaccc
+0, 10, 10, 1, 152064, 0xd5b6d717
+0, 11, 11, 1, 152064, 0x0159a097
+0, 12, 12, 1, 152064, 0x0db26ef5
+0, 13, 13, 1, 152064, 0x87724490
+0, 14, 14, 1, 152064, 0xb65fe715
+0, 15, 15, 1, 152064, 0x1d7264b4
+0, 16, 16, 1, 152064, 0xe3367e31
+0, 17, 17, 1, 152064, 0x756d5f5c
+0, 18, 18, 1, 152064, 0x182b8835
+0, 19, 19, 1, 152064, 0xf315fcb7
+0, 20, 20, 1, 152064, 0x3e671758
+0, 21, 21, 1, 152064, 0x9828452f
+0, 22, 22, 1, 152064, 0x475e3fd4
+0, 23, 23, 1, 152064, 0xfdd886f3
+0, 24, 24, 1, 152064, 0xc0391253
+0, 25, 25, 1, 152064, 0x4757d0d3
+0, 26, 26, 1, 152064, 0xd098039f
+0, 27, 27, 1, 152064, 0x091d5698
+0, 28, 28, 1, 152064, 0x1f6d5d07
+0, 29, 29, 1, 152064, 0x202a0756
+0, 30, 30, 1, 152064, 0x8fe2f52d
+0, 31, 31, 1, 152064, 0xfc302e24
+0, 32, 32, 1, 152064, 0x6aa951c8
+0, 33, 33, 1, 152064, 0x16c1bce8
+0, 34, 34, 1, 152064, 0xdfe1837b
+0, 35, 35, 1, 152064, 0x0e2dbb98
+0, 36, 36, 1, 152064, 0xae009fbd
+0, 37, 37, 1, 152064, 0x2641afc8
+0, 38, 38, 1, 152064, 0x5d9c1190
+0, 39, 39, 1, 152064, 0x6542fb66
+0, 40, 40, 1, 152064, 0xe090f4da
+0, 41, 41, 1, 152064, 0x86c5246b
+0, 42, 42, 1, 152064, 0x34f63122
+0, 43, 43, 1, 152064, 0x3e468919
+0, 44, 44, 1, 152064, 0x815c694d
+0, 45, 45, 1, 152064, 0xd4e1e969
+0, 46, 46, 1, 152064, 0xebbddb8b
+0, 47, 47, 1, 152064, 0x0c2d5c36
+0, 48, 48, 1, 152064, 0x991047ce
+0, 49, 49, 1, 152064, 0x615d743b
diff --git a/tests/ref/fate/filter-fade b/tests/ref/fate/filter-fade
index 3acd889..446db77 100644
--- a/tests/ref/fate/filter-fade
+++ b/tests/ref/fate/filter-fade
@@ -1,51 +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, 1, 1, 1, 152064, 0xb4e6c735
+0, 2, 2, 1, 152064, 0xb4e6c735
+0, 3, 3, 1, 152064, 0xb4e6c735
+0, 4, 4, 1, 152064, 0xb4e6c735
+0, 5, 5, 1, 152064, 0xb4e6c735
+0, 6, 6, 1, 152064, 0x54bae320
+0, 7, 7, 1, 152064, 0x53b60b7e
+0, 8, 8, 1, 152064, 0x8bed0304
+0, 9, 9, 1, 152064, 0x509c4b78
+0, 10, 10, 1, 152064, 0x4cf869a4
+0, 11, 11, 1, 152064, 0x958b7c66
+0, 12, 12, 1, 152064, 0x45841fbf
+0, 13, 13, 1, 152064, 0xcfee57ea
+0, 14, 14, 1, 152064, 0x979ff709
+0, 15, 15, 1, 152064, 0xf7ffd5e2
+0, 16, 16, 1, 152064, 0xc42f4370
+0, 17, 17, 1, 152064, 0x71ae098f
+0, 18, 18, 1, 152064, 0x64146a42
+0, 19, 19, 1, 152064, 0xdb3068fd
+0, 20, 20, 1, 152064, 0xfc7bf570
+0, 21, 21, 1, 152064, 0x9dc72412
+0, 22, 22, 1, 152064, 0x445d1d59
+0, 23, 23, 1, 152064, 0x2f2768ef
+0, 24, 24, 1, 152064, 0xce09f9d6
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
+0, 26, 26, 1, 152064, 0x43d796b5
+0, 27, 27, 1, 152064, 0xd780d887
+0, 28, 28, 1, 152064, 0x76d2a455
+0, 29, 29, 1, 152064, 0x6dc3650e
+0, 30, 30, 1, 152064, 0x0f9d6aca
+0, 31, 31, 1, 152064, 0x11446a9b
+0, 32, 32, 1, 152064, 0x00be684c
+0, 33, 33, 1, 152064, 0xe5f9ee52
+0, 34, 34, 1, 152064, 0x21ecafb8
+0, 35, 35, 1, 152064, 0xd42c962c
+0, 36, 36, 1, 152064, 0xe00a270d
+0, 37, 37, 1, 152064, 0xc1b53878
+0, 38, 38, 1, 152064, 0xfc4e28dd
+0, 39, 39, 1, 152064, 0x9c574e39
+0, 40, 40, 1, 152064, 0xdd25cf9d
+0, 41, 41, 1, 152064, 0x32959e70
+0, 42, 42, 1, 152064, 0xac6498d5
+0, 43, 43, 1, 152064, 0xcd595d21
+0, 44, 44, 1, 152064, 0x2953ff74
+0, 45, 45, 1, 152064, 0xb4e6c735
+0, 46, 46, 1, 152064, 0xb4e6c735
+0, 47, 47, 1, 152064, 0xb4e6c735
+0, 48, 48, 1, 152064, 0xb4e6c735
+0, 49, 49, 1, 152064, 0xb4e6c735
diff --git a/tests/ref/fate/filter-unsharp b/tests/ref/fate/filter-unsharp
index 5dcf40f..613163b 100644
--- a/tests/ref/fate/filter-unsharp
+++ b/tests/ref/fate/filter-unsharp
@@ -1,51 +1,51 @@
#tb 0: 1/25
-0, 0, 0, 1, 152064, 0x19a94798
-0, 1, 1, 1, 152064, 0xc88b24f4
-0, 2, 2, 1, 152064, 0xd027b44b
-0, 3, 3, 1, 152064, 0xa9fb3e54
-0, 4, 4, 1, 152064, 0x2991747d
-0, 5, 5, 1, 152064, 0x1dc267fc
-0, 6, 6, 1, 152064, 0xe9063293
-0, 7, 7, 1, 152064, 0xc23e41a4
-0, 8, 8, 1, 152064, 0xaa433dc5
-0, 9, 9, 1, 152064, 0x22b0f0a3
-0, 10, 10, 1, 152064, 0x796d08d8
-0, 11, 11, 1, 152064, 0xa2babd6b
-0, 12, 12, 1, 152064, 0x531e6a62
-0, 13, 13, 1, 152064, 0xc8fa5b9d
-0, 14, 14, 1, 152064, 0x33e54ae8
-0, 15, 15, 1, 152064, 0x86dfd0b8
-0, 16, 16, 1, 152064, 0x101f1170
-0, 17, 17, 1, 152064, 0x230eef00
-0, 18, 18, 1, 152064, 0xa5ee1c5e
-0, 19, 19, 1, 152064, 0x241893c6
-0, 20, 20, 1, 152064, 0x86a0a883
-0, 21, 21, 1, 152064, 0x12b4d8f7
-0, 22, 22, 1, 152064, 0xb220d497
-0, 23, 23, 1, 152064, 0xbaea200e
-0, 24, 24, 1, 152064, 0x6d96b7f3
-0, 25, 25, 1, 152064, 0xc70d4ebb
-0, 26, 26, 1, 152064, 0x20df50af
-0, 27, 27, 1, 152064, 0xfce89174
-0, 28, 28, 1, 152064, 0x74be5c8e
-0, 29, 29, 1, 152064, 0x51f419a6
-0, 30, 30, 1, 152064, 0x790621e7
-0, 31, 31, 1, 152064, 0x37387da2
-0, 32, 32, 1, 152064, 0x8228baa4
-0, 33, 33, 1, 152064, 0xdd2a42b7
-0, 34, 34, 1, 152064, 0xa28bfc63
-0, 35, 35, 1, 152064, 0xe8284337
-0, 36, 36, 1, 152064, 0xb1dae9fe
-0, 37, 37, 1, 152064, 0x0378c0af
-0, 38, 38, 1, 152064, 0x79c514d4
-0, 39, 39, 1, 152064, 0x043e0347
-0, 40, 40, 1, 152064, 0x4d11131b
-0, 41, 41, 1, 152064, 0xb2a05924
-0, 42, 42, 1, 152064, 0xd0097464
-0, 43, 43, 1, 152064, 0x32dfd8c0
-0, 44, 44, 1, 152064, 0xd9ecbf03
-0, 45, 45, 1, 152064, 0x8dcc403f
-0, 46, 46, 1, 152064, 0x95e81af7
-0, 47, 47, 1, 152064, 0xb8018b25
-0, 48, 48, 1, 152064, 0xeecf7281
-0, 49, 49, 1, 152064, 0x23e49602
+0, 0, 0, 1, 152064, 0x58100735
+0, 1, 1, 1, 152064, 0x2967e43d
+0, 2, 2, 1, 152064, 0x6f0c786d
+0, 3, 3, 1, 152064, 0xaf1fff7c
+0, 4, 4, 1, 152064, 0xee583651
+0, 5, 5, 1, 152064, 0xf50c280f
+0, 6, 6, 1, 152064, 0x3eeff2e9
+0, 7, 7, 1, 152064, 0xb43c0fc7
+0, 8, 8, 1, 152064, 0x55733232
+0, 9, 9, 1, 152064, 0x78b5b9fe
+0, 10, 10, 1, 152064, 0x8b39c410
+0, 11, 11, 1, 152064, 0x1a2b686f
+0, 12, 12, 1, 152064, 0xee622ce9
+0, 13, 13, 1, 152064, 0x9f8a2f4f
+0, 14, 14, 1, 152064, 0xd6210d42
+0, 15, 15, 1, 152064, 0x598a8e88
+0, 16, 16, 1, 152064, 0xeeaccbfa
+0, 17, 17, 1, 152064, 0xe2a3b094
+0, 18, 18, 1, 152064, 0x2becd63d
+0, 19, 19, 1, 152064, 0x2cfd46c6
+0, 20, 20, 1, 152064, 0x781b616e
+0, 21, 21, 1, 152064, 0x90908f49
+0, 22, 22, 1, 152064, 0x136d8950
+0, 23, 23, 1, 152064, 0xe3b8dfa4
+0, 24, 24, 1, 152064, 0x9a857595
+0, 25, 25, 1, 152064, 0x9d5d16f3
+0, 26, 26, 1, 152064, 0xad0815e6
+0, 27, 27, 1, 152064, 0xbd485852
+0, 28, 28, 1, 152064, 0x379023e0
+0, 29, 29, 1, 152064, 0x47c3e49e
+0, 30, 30, 1, 152064, 0x435eead9
+0, 31, 31, 1, 152064, 0x6ef8445d
+0, 32, 32, 1, 152064, 0x13258191
+0, 33, 33, 1, 152064, 0x09adfa4b
+0, 34, 34, 1, 152064, 0xd67e9f1f
+0, 35, 35, 1, 152064, 0x456e1298
+0, 36, 36, 1, 152064, 0x9998b485
+0, 37, 37, 1, 152064, 0xca1f8859
+0, 38, 38, 1, 152064, 0x9d1ad87c
+0, 39, 39, 1, 152064, 0x37a7cfac
+0, 40, 40, 1, 152064, 0xde3ad5a8
+0, 41, 41, 1, 152064, 0xf40c20d3
+0, 42, 42, 1, 152064, 0x35a23e85
+0, 43, 43, 1, 152064, 0xda1fa02a
+0, 44, 44, 1, 152064, 0xe4ae84e9
+0, 45, 45, 1, 152064, 0x113dfdbb
+0, 46, 46, 1, 152064, 0xe50fd571
+0, 47, 47, 1, 152064, 0xd6a043ef
+0, 48, 48, 1, 152064, 0xabfd3940
+0, 49, 49, 1, 152064, 0xdf085a8d
More information about the ffmpeg-cvslog
mailing list