mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit '43a8333a16c796b3d855fb3aaa742103cb62731f'
* commit '43a8333a16c796b3d855fb3aaa742103cb62731f': FATE: add a test for the channelsplit filter FATE: add a test for the channelmap filter FATE: add a test for the negate filter FATE: add a test for the overlay filter Conflicts: tests/fate/filter.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
7a14564b2d
@ -39,6 +39,20 @@ 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-$(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 = 06168d06085e2c0603e4e118ba4cade2
|
||||
|
||||
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 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
|
||||
@ -55,6 +69,12 @@ 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
|
||||
|
||||
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
|
||||
|
||||
|
1
tests/filtergraphs/channelmap
Normal file
1
tests/filtergraphs/channelmap
Normal file
@ -0,0 +1 @@
|
||||
channelmap=map=1\,2\,0\,5\,3\,4:channel_layout=5.1
|
2
tests/filtergraphs/overlay
Normal file
2
tests/filtergraphs/overlay
Normal file
@ -0,0 +1,2 @@
|
||||
[1:v] scale=50:50 [over];
|
||||
[0:v][over] overlay=20:20
|
51
tests/ref/fate/filter-negate
Normal file
51
tests/ref/fate/filter-negate
Normal file
@ -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
|
51
tests/ref/fate/filter-overlay
Normal file
51
tests/ref/fate/filter-overlay
Normal file
@ -0,0 +1,51 @@
|
||||
#tb 0: 1/25
|
||||
0, 0, 0, 1, 152064, 0xffb77a34
|
||||
0, 1, 1, 1, 152064, 0x866267f2
|
||||
0, 2, 2, 1, 152064, 0x1033f97f
|
||||
0, 3, 3, 1, 152064, 0x266699ea
|
||||
0, 4, 4, 1, 152064, 0x3d50cb34
|
||||
0, 5, 5, 1, 152064, 0x04559792
|
||||
0, 6, 6, 1, 152064, 0x70432827
|
||||
0, 7, 7, 1, 152064, 0x3fd8282c
|
||||
0, 8, 8, 1, 152064, 0x512c353b
|
||||
0, 9, 9, 1, 152064, 0x3d6114eb
|
||||
0, 10, 10, 1, 152064, 0xf87751aa
|
||||
0, 11, 11, 1, 152064, 0x76cb091f
|
||||
0, 12, 12, 1, 152064, 0xbe63eb36
|
||||
0, 13, 13, 1, 152064, 0xc19bcdd5
|
||||
0, 14, 14, 1, 152064, 0xe21c4c5d
|
||||
0, 15, 15, 1, 152064, 0x671ab9b5
|
||||
0, 16, 16, 1, 152064, 0x4ffcdcd3
|
||||
0, 17, 17, 1, 152064, 0x6cc7ed10
|
||||
0, 18, 18, 1, 152064, 0x19612034
|
||||
0, 19, 19, 1, 152064, 0x31c0999a
|
||||
0, 20, 20, 1, 152064, 0xd14eb105
|
||||
0, 21, 21, 1, 152064, 0x4976e4b4
|
||||
0, 22, 22, 1, 152064, 0x7bc8e85d
|
||||
0, 23, 23, 1, 152064, 0xaf522965
|
||||
0, 24, 24, 1, 152064, 0x0b01e419
|
||||
0, 25, 25, 1, 152064, 0x1c07aacb
|
||||
0, 26, 26, 1, 152064, 0x2813a828
|
||||
0, 27, 27, 1, 152064, 0x956412a4
|
||||
0, 28, 28, 1, 152064, 0xb9f10b96
|
||||
0, 29, 29, 1, 152064, 0x756bb78c
|
||||
0, 30, 30, 1, 152064, 0x758f8389
|
||||
0, 31, 31, 1, 152064, 0xa8a19f1b
|
||||
0, 32, 32, 1, 152064, 0x5846b4ae
|
||||
0, 33, 33, 1, 152064, 0xb9a9fe23
|
||||
0, 34, 34, 1, 152064, 0xefd6be7d
|
||||
0, 35, 35, 1, 152064, 0xffde6849
|
||||
0, 36, 36, 1, 152064, 0xd8284623
|
||||
0, 37, 37, 1, 152064, 0xa1754236
|
||||
0, 38, 38, 1, 152064, 0x00c384cd
|
||||
0, 39, 39, 1, 152064, 0xa3538c53
|
||||
0, 40, 40, 1, 152064, 0x039c7df0
|
||||
0, 41, 41, 1, 152064, 0x89abb26f
|
||||
0, 42, 42, 1, 152064, 0xd84cbc79
|
||||
0, 43, 43, 1, 152064, 0xd87111a0
|
||||
0, 44, 44, 1, 152064, 0x6dcbd7cc
|
||||
0, 45, 45, 1, 152064, 0x2a7b53d5
|
||||
0, 46, 46, 1, 152064, 0xbb70187c
|
||||
0, 47, 47, 1, 152064, 0xfc809695
|
||||
0, 48, 48, 1, 152064, 0x5b608465
|
||||
0, 49, 49, 1, 152064, 0x6169c077
|
Loading…
Reference in New Issue
Block a user