Merge commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a'

* commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a':
  FATE: add a test for the setpts filter
  FATE: add a test for the hqdn3d filter
  FATE: add a test for the transpose filter
  FATE: add a test for the unsharp filter

Conflicts:
	tests/ref/fate/filter-hqdn3d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-28 14:00:15 +01:00
commit 8823ec4f9e
7 changed files with 281 additions and 76 deletions

View File

@ -52,6 +52,18 @@ fate-filter-fade: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf fade=in:0:25,fade=out
FATE_FILTER_VSYNTH-$(CONFIG_GRADFUN_FILTER) += fate-filter-gradfun
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-$(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
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_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
@ -60,8 +72,8 @@ fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLE
FATE_FILTER-$(call FILTERDEMDEC, YADIF, MPEGTS, MPEG2VIDEO) += $(FATE_YADIF)
FATE_HQDN3D += fate-filter-hqdn3d
fate-filter-hqdn3d: CMD = framecrc -idct simple -i $(SAMPLES)/smjpeg/scenwin.mjpg -vf perms=random,hqdn3d -an
FATE_HQDN3D += fate-filter-hqdn3d-ubitux
fate-filter-hqdn3d-ubitux: CMD = framecrc -idct simple -i $(SAMPLES)/smjpeg/scenwin.mjpg -vf perms=random,hqdn3d -an
FATE_FILTER-$(call ALLYES, SMJPEG_DEMUXER MJPEG_DECODER PERMS_FILTER HQDN3D_FILTER) += $(FATE_HQDN3D)
fate-filter-curves: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_median.avi -vf perms=random,curves=vintage

View File

@ -0,0 +1,2 @@
settb=1/1000,
setpts=1/(35*TB) * (N + 0.05 * sin(N*2*PI/25))

View File

@ -1,74 +1,51 @@
#tb 0: 1/9
0, 0, 0, 1, 115200, 0x2c810465
0, 1, 1, 1, 115200, 0x957c0563
0, 2, 2, 1, 115200, 0x786c6d5b
0, 3, 3, 1, 115200, 0xd5ef87d3
0, 4, 4, 1, 115200, 0x3a2158e2
0, 5, 5, 1, 115200, 0x19d7d048
0, 6, 6, 1, 115200, 0x16d5e09a
0, 7, 7, 1, 115200, 0x73cca454
0, 8, 8, 1, 115200, 0x4d6be3bc
0, 9, 9, 1, 115200, 0x672aad0f
0, 10, 10, 1, 115200, 0x1bd103b7
0, 11, 11, 1, 115200, 0xbc3a9c02
0, 12, 12, 1, 115200, 0xa19cb68c
0, 13, 13, 1, 115200, 0x83477b6c
0, 14, 14, 1, 115200, 0x68b6898e
0, 15, 15, 1, 115200, 0xebbc5701
0, 16, 16, 1, 115200, 0x37e873db
0, 17, 17, 1, 115200, 0xcf9e7ad1
0, 18, 18, 1, 115200, 0x3fdffd3a
0, 19, 19, 1, 115200, 0x413da058
0, 20, 20, 1, 115200, 0xa432b2f6
0, 21, 21, 1, 115200, 0x9c532b61
0, 22, 22, 1, 115200, 0x40c03856
0, 23, 23, 1, 115200, 0xf8310ec7
0, 24, 24, 1, 115200, 0x89246da7
0, 25, 25, 1, 115200, 0x501d4dd0
0, 26, 26, 1, 115200, 0xe5151ebf
0, 27, 27, 1, 115200, 0xc166e201
0, 28, 28, 1, 115200, 0xded25b69
0, 29, 29, 1, 115200, 0xb51ec43f
0, 30, 30, 1, 115200, 0x9bba20eb
0, 31, 31, 1, 115200, 0x7a7b9278
0, 32, 32, 1, 115200, 0xe98475d0
0, 33, 33, 1, 115200, 0x960dc933
0, 34, 34, 1, 115200, 0xe93f558b
0, 35, 35, 1, 115200, 0x37ae3e42
0, 36, 36, 1, 115200, 0x0ecaf64a
0, 37, 37, 1, 115200, 0xd5938191
0, 38, 38, 1, 115200, 0xeb04510a
0, 39, 39, 1, 115200, 0xf5729201
0, 40, 40, 1, 115200, 0xb2c04015
0, 41, 41, 1, 115200, 0xd883143e
0, 42, 42, 1, 115200, 0x5e04197b
0, 43, 43, 1, 115200, 0x6b846e24
0, 44, 44, 1, 115200, 0x026e7a0b
0, 45, 45, 1, 115200, 0xf8c6708b
0, 46, 46, 1, 115200, 0x3fe75c63
0, 47, 47, 1, 115200, 0xf56467b1
0, 48, 48, 1, 115200, 0xf1230483
0, 49, 49, 1, 115200, 0x35a615ce
0, 50, 50, 1, 115200, 0x30b42d7b
0, 51, 51, 1, 115200, 0x8b7f22a1
0, 52, 52, 1, 115200, 0x03a2e789
0, 53, 53, 1, 115200, 0x15532e9e
0, 54, 54, 1, 115200, 0xbe85f37a
0, 55, 55, 1, 115200, 0x2c581d60
0, 56, 56, 1, 115200, 0xd7a506ed
0, 57, 57, 1, 115200, 0x35e09799
0, 58, 58, 1, 115200, 0x2d4f5499
0, 59, 59, 1, 115200, 0x92fdc85b
0, 60, 60, 1, 115200, 0x33f4888a
0, 61, 61, 1, 115200, 0x65e04e05
0, 62, 62, 1, 115200, 0x14766728
0, 63, 63, 1, 115200, 0x2a432c3f
0, 64, 64, 1, 115200, 0x136a1362
0, 65, 65, 1, 115200, 0xfbf4cb01
0, 66, 66, 1, 115200, 0x7dcaff69
0, 67, 67, 1, 115200, 0x5afd3b9e
0, 68, 68, 1, 115200, 0x86fcb122
0, 69, 69, 1, 115200, 0xc988b519
0, 70, 70, 1, 115200, 0x48fd3e75
0, 71, 71, 1, 115200, 0x2728a2d7
0, 72, 72, 1, 115200, 0xa2ac6418
#tb 0: 1/25
0, 0, 0, 1, 152064, 0x0c09883a
0, 1, 1, 1, 152064, 0xfc2748a0
0, 2, 2, 1, 152064, 0xb746eea8
0, 3, 3, 1, 152064, 0xf14192d7
0, 4, 4, 1, 152064, 0xae26db7f
0, 5, 5, 1, 152064, 0xe1a7da48
0, 6, 6, 1, 152064, 0x5196b387
0, 7, 7, 1, 152064, 0x20eac7ff
0, 8, 8, 1, 152064, 0x4896c7f5
0, 9, 9, 1, 152064, 0x97ba6468
0, 10, 10, 1, 152064, 0x29b19884
0, 11, 11, 1, 152064, 0x591e4e14
0, 12, 12, 1, 152064, 0xb692fc98
0, 13, 13, 1, 152064, 0x3457ed57
0, 14, 14, 1, 152064, 0xbb10d71d
0, 15, 15, 1, 152064, 0x47f45b57
0, 16, 16, 1, 152064, 0xddbd8bc6
0, 17, 17, 1, 152064, 0x1ef36e02
0, 18, 18, 1, 152064, 0x55a363d2
0, 19, 19, 1, 152064, 0x11c1c2f4
0, 20, 20, 1, 152064, 0x553bdc2b
0, 21, 21, 1, 152064, 0x2101d886
0, 22, 22, 1, 152064, 0xe8f77998
0, 23, 23, 1, 152064, 0x39bac7ff
0, 24, 24, 1, 152064, 0x09a4172e
0, 25, 25, 1, 152064, 0x6121f57f
0, 26, 26, 1, 152064, 0x60e7525c
0, 27, 27, 1, 152064, 0xd7895259
0, 28, 28, 1, 152064, 0x12b2153b
0, 29, 29, 1, 152064, 0x6119a22e
0, 30, 30, 1, 152064, 0xf1969bd5
0, 31, 31, 1, 152064, 0x7b03fc83
0, 32, 32, 1, 152064, 0x17383667
0, 33, 33, 1, 152064, 0x332bbfba
0, 34, 34, 1, 152064, 0x253998a8
0, 35, 35, 1, 152064, 0x2614c984
0, 36, 36, 1, 152064, 0x50c86e8d
0, 37, 37, 1, 152064, 0x9ff23b55
0, 38, 38, 1, 152064, 0xc4589665
0, 39, 39, 1, 152064, 0x5e7d86c7
0, 40, 40, 1, 152064, 0xdda07f2f
0, 41, 41, 1, 152064, 0xa1dacf4a
0, 42, 42, 1, 152064, 0x3c83fb32
0, 43, 43, 1, 152064, 0xa43da916
0, 44, 44, 1, 152064, 0x0e767b80
0, 45, 45, 1, 152064, 0xa18c5f82
0, 46, 46, 1, 152064, 0xdb21c249
0, 47, 47, 1, 152064, 0xb126341e
0, 48, 48, 1, 152064, 0xc14742be
0, 49, 49, 1, 152064, 0x582f631d

View File

@ -0,0 +1,74 @@
#tb 0: 1/9
0, 0, 0, 1, 115200, 0x2c810465
0, 1, 1, 1, 115200, 0x957c0563
0, 2, 2, 1, 115200, 0x786c6d5b
0, 3, 3, 1, 115200, 0xd5ef87d3
0, 4, 4, 1, 115200, 0x3a2158e2
0, 5, 5, 1, 115200, 0x19d7d048
0, 6, 6, 1, 115200, 0x16d5e09a
0, 7, 7, 1, 115200, 0x73cca454
0, 8, 8, 1, 115200, 0x4d6be3bc
0, 9, 9, 1, 115200, 0x672aad0f
0, 10, 10, 1, 115200, 0x1bd103b7
0, 11, 11, 1, 115200, 0xbc3a9c02
0, 12, 12, 1, 115200, 0xa19cb68c
0, 13, 13, 1, 115200, 0x83477b6c
0, 14, 14, 1, 115200, 0x68b6898e
0, 15, 15, 1, 115200, 0xebbc5701
0, 16, 16, 1, 115200, 0x37e873db
0, 17, 17, 1, 115200, 0xcf9e7ad1
0, 18, 18, 1, 115200, 0x3fdffd3a
0, 19, 19, 1, 115200, 0x413da058
0, 20, 20, 1, 115200, 0xa432b2f6
0, 21, 21, 1, 115200, 0x9c532b61
0, 22, 22, 1, 115200, 0x40c03856
0, 23, 23, 1, 115200, 0xf8310ec7
0, 24, 24, 1, 115200, 0x89246da7
0, 25, 25, 1, 115200, 0x501d4dd0
0, 26, 26, 1, 115200, 0xe5151ebf
0, 27, 27, 1, 115200, 0xc166e201
0, 28, 28, 1, 115200, 0xded25b69
0, 29, 29, 1, 115200, 0xb51ec43f
0, 30, 30, 1, 115200, 0x9bba20eb
0, 31, 31, 1, 115200, 0x7a7b9278
0, 32, 32, 1, 115200, 0xe98475d0
0, 33, 33, 1, 115200, 0x960dc933
0, 34, 34, 1, 115200, 0xe93f558b
0, 35, 35, 1, 115200, 0x37ae3e42
0, 36, 36, 1, 115200, 0x0ecaf64a
0, 37, 37, 1, 115200, 0xd5938191
0, 38, 38, 1, 115200, 0xeb04510a
0, 39, 39, 1, 115200, 0xf5729201
0, 40, 40, 1, 115200, 0xb2c04015
0, 41, 41, 1, 115200, 0xd883143e
0, 42, 42, 1, 115200, 0x5e04197b
0, 43, 43, 1, 115200, 0x6b846e24
0, 44, 44, 1, 115200, 0x026e7a0b
0, 45, 45, 1, 115200, 0xf8c6708b
0, 46, 46, 1, 115200, 0x3fe75c63
0, 47, 47, 1, 115200, 0xf56467b1
0, 48, 48, 1, 115200, 0xf1230483
0, 49, 49, 1, 115200, 0x35a615ce
0, 50, 50, 1, 115200, 0x30b42d7b
0, 51, 51, 1, 115200, 0x8b7f22a1
0, 52, 52, 1, 115200, 0x03a2e789
0, 53, 53, 1, 115200, 0x15532e9e
0, 54, 54, 1, 115200, 0xbe85f37a
0, 55, 55, 1, 115200, 0x2c581d60
0, 56, 56, 1, 115200, 0xd7a506ed
0, 57, 57, 1, 115200, 0x35e09799
0, 58, 58, 1, 115200, 0x2d4f5499
0, 59, 59, 1, 115200, 0x92fdc85b
0, 60, 60, 1, 115200, 0x33f4888a
0, 61, 61, 1, 115200, 0x65e04e05
0, 62, 62, 1, 115200, 0x14766728
0, 63, 63, 1, 115200, 0x2a432c3f
0, 64, 64, 1, 115200, 0x136a1362
0, 65, 65, 1, 115200, 0xfbf4cb01
0, 66, 66, 1, 115200, 0x7dcaff69
0, 67, 67, 1, 115200, 0x5afd3b9e
0, 68, 68, 1, 115200, 0x86fcb122
0, 69, 69, 1, 115200, 0xc988b519
0, 70, 70, 1, 115200, 0x48fd3e75
0, 71, 71, 1, 115200, 0x2728a2d7
0, 72, 72, 1, 115200, 0xa2ac6418

View File

@ -0,0 +1,38 @@
#tb 0: 1/25
0, 0, 0, 1, 152064, 0x05b789ef
0, 1, 1, 1, 152064, 0x4bb46551
0, 2, 2, 1, 152064, 0x9dddf64a
0, 3, 3, 1, 152064, 0x2a8380b0
0, 4, 4, 1, 152064, 0x4de3b652
0, 5, 5, 1, 152064, 0xedb5a8e6
0, 6, 6, 1, 152064, 0x5ab58bac
0, 7, 7, 1, 152064, 0x1f1b8026
0, 8, 8, 1, 152064, 0x02344760
0, 9, 9, 1, 152064, 0x30f5fcd5
0, 10, 10, 1, 152064, 0xc711ad61
0, 11, 11, 1, 152064, 0x52a48ddd
0, 12, 12, 1, 152064, 0xa91c0f05
0, 13, 13, 1, 152064, 0xb15d38c8
0, 14, 14, 1, 152064, 0xf25f6acc
0, 15, 15, 1, 152064, 0xf34ddbff
0, 16, 16, 1, 152064, 0x9dc72412
0, 17, 17, 1, 152064, 0x445d1d59
0, 18, 18, 1, 152064, 0xce09f9d6
0, 19, 19, 1, 152064, 0x95579936
0, 20, 20, 1, 152064, 0x43d796b5
0, 21, 21, 1, 152064, 0x76d2a455
0, 22, 22, 1, 152064, 0x6dc3650e
0, 23, 23, 1, 152064, 0xe295c51e
0, 24, 24, 1, 152064, 0xd766fc8d
0, 25, 25, 1, 152064, 0xe22f7a30
0, 26, 26, 1, 152064, 0xfa8d94fb
0, 27, 27, 1, 152064, 0x4c9737ab
0, 28, 28, 1, 152064, 0x0b07594c
0, 29, 29, 1, 152064, 0x88734edd
0, 30, 30, 1, 152064, 0xd2735925
0, 31, 31, 1, 152064, 0x20cebfa9
0, 32, 32, 1, 152064, 0x575c20ec
0, 33, 33, 1, 152064, 0x61b47e73
0, 34, 34, 1, 152064, 0x09ef53ff
0, 35, 35, 1, 152064, 0x6e88c5c2
0, 36, 36, 1, 152064, 0x4bbad8ea

View File

@ -0,0 +1,51 @@
#tb 0: 1/25
0, 0, 0, 1, 152064, 0xab5889ef
0, 1, 1, 1, 152064, 0x898b6551
0, 2, 2, 1, 152064, 0x231bf64a
0, 3, 3, 1, 152064, 0x0b8c80b0
0, 4, 4, 1, 152064, 0x8b3cb652
0, 5, 5, 1, 152064, 0x0100a8e6
0, 6, 6, 1, 152064, 0x55df7c23
0, 7, 7, 1, 152064, 0x91bd8bac
0, 8, 8, 1, 152064, 0xf5508026
0, 9, 9, 1, 152064, 0xa7ec3915
0, 10, 10, 1, 152064, 0x4e304760
0, 11, 11, 1, 152064, 0x98ccfcd5
0, 12, 12, 1, 152064, 0x00edad61
0, 13, 13, 1, 152064, 0x01a0a223
0, 14, 14, 1, 152064, 0x840e8ddd
0, 15, 15, 1, 152064, 0x52280f05
0, 16, 16, 1, 152064, 0x75064e18
0, 17, 17, 1, 152064, 0xf41638c8
0, 18, 18, 1, 152064, 0x258d6acc
0, 19, 19, 1, 152064, 0x9d73dbff
0, 20, 20, 1, 152064, 0x80e0f570
0, 21, 21, 1, 152064, 0x3a912412
0, 22, 22, 1, 152064, 0xaf241d59
0, 23, 23, 1, 152064, 0xe73568ef
0, 24, 24, 1, 152064, 0xc739f9d6
0, 25, 25, 1, 152064, 0xc8c19936
0, 26, 26, 1, 152064, 0x47dd96b5
0, 27, 27, 1, 152064, 0x5329d887
0, 28, 28, 1, 152064, 0x5b46a455
0, 29, 29, 1, 152064, 0xfd8c650e
0, 30, 30, 1, 152064, 0x85c86aca
0, 31, 31, 1, 152064, 0x46a6c51e
0, 32, 32, 1, 152064, 0x220dfc8d
0, 33, 33, 1, 152064, 0xdbe27a30
0, 34, 34, 1, 152064, 0xb8cc4378
0, 35, 35, 1, 152064, 0xb6cf94fb
0, 36, 36, 1, 152064, 0xeaa937ab
0, 37, 37, 1, 152064, 0x335401f8
0, 38, 38, 1, 152064, 0xdb3d594c
0, 39, 39, 1, 152064, 0x211c4edd
0, 40, 40, 1, 152064, 0xc3725925
0, 41, 41, 1, 152064, 0x8f389e08
0, 42, 42, 1, 152064, 0xc62cbfa9
0, 43, 43, 1, 152064, 0x803820ec
0, 44, 44, 1, 152064, 0x0d860471
0, 45, 45, 1, 152064, 0xf6997e73
0, 46, 46, 1, 152064, 0x6c2153ff
0, 47, 47, 1, 152064, 0x1bb2c5c2
0, 48, 48, 1, 152064, 0x39d1b483
0, 49, 49, 1, 152064, 0x2b50d8ea

View File

@ -0,0 +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