Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

fate: move more tests from lavfi-regression.sh to filter-video.mak.

Browse Source
pull/16/head
Clément Bœsch 12 years ago
parent e92862e75f
commit c703f7bdbd
30 changed files with 219 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      tests/fate/avfilter.mak
  2. 54
      tests/fate/filter-video.mak
  3. 4
      tests/filtergraphs/overlay_rgb
  4. 4
      tests/filtergraphs/overlay_yuv420
  5. 4
      tests/filtergraphs/overlay_yuv444
  6. 23
      tests/lavfi-regression.sh
  7. 0
      tests/ref/fate/filter-edgedetect
  8. 0
      tests/ref/fate/filter-hue
  9. 0
      tests/ref/fate/filter-idet
  10. 51
      tests/ref/fate/filter-overlay_rgb
  11. 51
      tests/ref/fate/filter-overlay_yuv420
  12. 51
      tests/ref/fate/filter-overlay_yuv444
  13. 0
      tests/ref/fate/filter-pad
  14. 0
      tests/ref/fate/filter-pp
  15. 0
      tests/ref/fate/filter-pp2
  16. 0
      tests/ref/fate/filter-pp3
  17. 0
      tests/ref/fate/filter-pp4
  18. 0
      tests/ref/fate/filter-pp5
  19. 0
      tests/ref/fate/filter-pp6
  20. 0
      tests/ref/fate/filter-select
  21. 0
      tests/ref/fate/filter-setdar
  22. 0
      tests/ref/fate/filter-setsar
  23. 0
      tests/ref/fate/filter-thumbnail
  24. 0
      tests/ref/fate/filter-tile
  25. 1
      tests/ref/lavfi/drawbox
  26. 1
      tests/ref/lavfi/fade
  27. 1
      tests/ref/lavfi/overlay_rgb
  28. 1
      tests/ref/lavfi/overlay_yuv420
  29. 1
      tests/ref/lavfi/overlay_yuv444
  30. 1
      tests/ref/lavfi/unsharp

22
tests/fate/avfilter.mak
Unescape View File

@ -4,23 +4,8 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb \
fate-lavfi-alphaextract_yuv \
fate-lavfi-alphamerge_rgb \
fate-lavfi-alphamerge_yuv \
fate-lavfi-drawbox \
fate-lavfi-edgedetect \
fate-lavfi-fade \
fate-lavfi-field \
fate-lavfi-idet \
fate-lavfi-il \
fate-lavfi-overlay_rgb \
fate-lavfi-overlay_yuv420 \
fate-lavfi-overlay_yuv444 \
fate-lavfi-pad \
fate-lavfi-select \
fate-lavfi-setdar \
fate-lavfi-setsar \
fate-lavfi-thumbnail \
fate-lavfi-tile \
fate-lavfi-transpose \
fate-lavfi-unsharp \
FATE_LAVFI-$(CONFIG_AVDEVICE) += fate-lavfi-life \
fate-lavfi-scalenorm \
@ -28,15 +13,8 @@ FATE_LAVFI-$(CONFIG_AVDEVICE) += fate-lavfi-life \
FATE_LAVFI-$(CONFIG_GPL) += fate-lavfi-colormatrix1 \
fate-lavfi-colormatrix2 \
fate-lavfi-hue \
fate-lavfi-kerndeint \
fate-lavfi-pixfmts_super2xsai \
fate-lavfi-pp \
fate-lavfi-pp2 \
fate-lavfi-pp3 \
fate-lavfi-pp4 \
fate-lavfi-pp5 \
fate-lavfi-pp6 \
fate-lavfi-tinterlace_merge \
fate-lavfi-tinterlace_pad \

54
tests/fate/filter-video.mak
Unescape View File

@ -42,6 +42,15 @@ fate-filter-histogram-waveform: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf histogr
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, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_rgb
fate-filter-overlay_rgb: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay_rgb
FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv420
fate-filter-overlay_yuv420: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay_yuv420
FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv444
fate-filter-overlay_yuv444: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay_yuv444
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
@ -93,6 +102,51 @@ fate-filter-vflip_crop: CMD = video_filter "vflip,crop=iw-100:ih-100:100:100"
FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip_vflip
fate-filter-vflip_vflip: CMD = video_filter "vflip,vflip"
FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER PERMS_FILTER EDGEDETECT_FILTER) += fate-filter-edgedetect
fate-filter-edgedetect: CMD = video_filter "format=gray,perms=random,edgedetect"
FATE_FILTER_VSYNTH-$(call ALLYES, PERMS_FILTER HUE_FILTER) += fate-filter-hue
fate-filter-hue: CMD = video_filter "perms=random,hue=s=sin(2*PI*t)+1"
FATE_FILTER_VSYNTH-$(CONFIG_IDET_FILTER) += fate-filter-idet
fate-filter-idet: CMD = video_filter "idet"
FATE_FILTER_VSYNTH-$(CONFIG_PAD_FILTER) += fate-filter-pad
fate-filter-pad: CMD = video_filter "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2"
FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += fate-filter-pp
fate-filter-pp: CMD = video_filter "pp=be/hb/vb/tn/l5/al"
FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += fate-filter-pp2
fate-filter-pp2: CMD = video_filter "pp=be/fq|16/h1/v1/lb"
FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += fate-filter-pp3
fate-filter-pp3: CMD = video_filter "pp=be/fq|8/ha|128|7/va/li"
FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += fate-filter-pp4
fate-filter-pp4: CMD = video_filter "pp=be/ci"
FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += fate-filter-pp5
fate-filter-pp5: CMD = video_filter "pp=md"
FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += fate-filter-pp6
fate-filter-pp6: CMD = video_filter "pp=be/fd"
FATE_FILTER_VSYNTH-$(CONFIG_SELECT_FILTER) += fate-filter-select
fate-filter-select: CMD = video_filter "select=not(eq(mod(n\,2)\,0)+eq(mod(n\,3)\,0))"
FATE_FILTER_VSYNTH-$(CONFIG_SETDAR_FILTER) += fate-filter-setdar
fate-filter-setdar: CMD = video_filter "setdar=dar=16/9"
FATE_FILTER_VSYNTH-$(CONFIG_SETSAR_FILTER) += fate-filter-setsar
fate-filter-setsar: CMD = video_filter "setsar=sar=16/11"
FATE_FILTER_VSYNTH-$(CONFIG_THUMBNAIL_FILTER) += fate-filter-thumbnail
fate-filter-thumbnail: CMD = video_filter "thumbnail=10"
FATE_FILTER_VSYNTH-$(CONFIG_TILE_FILTER) += fate-filter-tile
fate-filter-tile: CMD = video_filter "tile=3x3:nb_frames=5:padding=7:margin=2"
FATE_FILTER_VSYNTH-$(CONFIG_FORMAT_FILTER) += fate-filter-pixdesc
fate-filter-pixdesc: CMD = pixdesc

4
tests/filtergraphs/overlay_rgb
Unescape View File

@ -0,0 +1,4 @@
sws_flags=+accurate_rnd+bitexact;
split [main][over];
[over] scale=88:72, pad=96:80:4:4 [overf];
[main][overf] overlay=240:16:format=rgb

4
tests/filtergraphs/overlay_yuv420
Unescape View File

@ -0,0 +1,4 @@
sws_flags=+accurate_rnd+bitexact;
split [main][over];
[over] scale=88:72, pad=96:80:4:4 [overf];
[main][overf] overlay=240:16:format=yuv420

4
tests/filtergraphs/overlay_yuv444
Unescape View File

@ -0,0 +1,4 @@
sws_flags=+accurate_rnd+bitexact;
split [main][over];
[over] scale=88:72, pad=96:80:4:4 [overf];
[main][overf] overlay=240:16:format=yuv444

23
tests/lavfi-regression.sh
Unescape View File

@ -39,29 +39,6 @@ do_lavfi_colormatrix() {
do_lavfi "${1}2" "$1=$2:$3,$1=$3:$2,$1=$2:$4,$1=$4:$2,$1=$2:$5,$1=$5:$4"
}
do_lavfi "drawbox" "drawbox=224:24:88:72:#FF8010@0.5"
do_lavfi "edgedetect" "format=gray,perms=random,edgedetect"
do_lavfi "fade" "fade=in:5:15,fade=out:30:15"
do_lavfi "hue" "perms=random,hue=s=sin(2*PI*t)+1"
do_lavfi "idet" "idet"
do_lavfi "overlay_rgb" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=rgb"
do_lavfi "overlay_yuv420" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=yuv420"
do_lavfi "overlay_yuv444" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=yuv444"
do_lavfi "pad" "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2"
do_lavfi "pp" "pp=be/hb/vb/tn/l5/al"
do_lavfi "pp2" "pp=be/fq|16/h1/v1/lb"
do_lavfi "pp3" "pp=be/fq|8/ha|128|7/va/li"
do_lavfi "pp4" "pp=be/ci"
do_lavfi "pp5" "pp=md"
do_lavfi "pp6" "pp=be/fd"
do_lavfi "select" "select=not(eq(mod(n\,2)\,0)+eq(mod(n\,3)\,0))"
do_lavfi "setdar" "setdar=dar=16/9"
do_lavfi "setsar" "setsar=sar=16/11"
do_lavfi "thumbnail" "thumbnail=10"
do_lavfi "tile" "tile=3x3:nb_frames=5:padding=7:margin=2"
do_lavfi "transpose" "transpose"
do_lavfi "unsharp" "unsharp=11:11:-1.5:11:11:-1.5"
do_lavfi_plain "alphamerge_rgb" "[in]format=bgra,split,alphamerge[out]"
do_lavfi_plain "alphamerge_yuv" "[in]format=yuv420p,split,alphamerge[out]"
do_lavfi_plain "alphaextract_rgb" "[in]format=bgra,split,alphamerge,split[o3][o4];[o4]alphaextract[alpha];[o3][alpha]alphamerge[out]"

0
tests/ref/lavfi/edgedetect → tests/ref/fate/filter-edgedetect
Unescape View File

0
tests/ref/lavfi/hue → tests/ref/fate/filter-hue
Unescape View File

0
tests/ref/lavfi/idet → tests/ref/fate/filter-idet
Unescape View File

51
tests/ref/fate/filter-overlay_rgb
Unescape View File

@ -0,0 +1,51 @@
#tb 0: 1/25
0, 0, 0, 1, 304128, 0xd4531e28
0, 1, 1, 1, 304128, 0xfb069ecd
0, 2, 2, 1, 304128, 0x4c376898
0, 3, 3, 1, 304128, 0x5a0c7282
0, 4, 4, 1, 304128, 0x4802850a
0, 5, 5, 1, 304128, 0xf670e9cc
0, 6, 6, 1, 304128, 0x5189c380
0, 7, 7, 1, 304128, 0x14d6de42
0, 8, 8, 1, 304128, 0xb65df5f1
0, 9, 9, 1, 304128, 0xc2f89ef5
0, 10, 10, 1, 304128, 0xde29db6b
0, 11, 11, 1, 304128, 0x10a71aae
0, 12, 12, 1, 304128, 0xf53d02ef
0, 13, 13, 1, 304128, 0x4b3632ca
0, 14, 14, 1, 304128, 0xce140f66
0, 15, 15, 1, 304128, 0x4bedf6f1
0, 16, 16, 1, 304128, 0xcc5edbd0
0, 17, 17, 1, 304128, 0x836a556a
0, 18, 18, 1, 304128, 0x3537c635
0, 19, 19, 1, 304128, 0x400df2dd
0, 20, 20, 1, 304128, 0x4292ccb3
0, 21, 21, 1, 304128, 0x2f71db21
0, 22, 22, 1, 304128, 0xa40b997c
0, 23, 23, 1, 304128, 0xeee30551
0, 24, 24, 1, 304128, 0x4f7bf0cb
0, 25, 25, 1, 304128, 0x9a70dfe0
0, 26, 26, 1, 304128, 0xc140124f
0, 27, 27, 1, 304128, 0x275bca59
0, 28, 28, 1, 304128, 0x4c62ceee
0, 29, 29, 1, 304128, 0xc1d54279
0, 30, 30, 1, 304128, 0xae7ef047
0, 31, 31, 1, 304128, 0x331570a8
0, 32, 32, 1, 304128, 0x10db2de2
0, 33, 33, 1, 304128, 0xcc60fdfb
0, 34, 34, 1, 304128, 0xe2cffcfa
0, 35, 35, 1, 304128, 0x5a7ff1fb
0, 36, 36, 1, 304128, 0xa39a4e47
0, 37, 37, 1, 304128, 0x79e40e52
0, 38, 38, 1, 304128, 0x53d0d393
0, 39, 39, 1, 304128, 0xeb5fcfc1
0, 40, 40, 1, 304128, 0x8923f95f
0, 41, 41, 1, 304128, 0xd27a2b71
0, 42, 42, 1, 304128, 0xe4fdd79e
0, 43, 43, 1, 304128, 0xcd8fb238
0, 44, 44, 1, 304128, 0x65e6eaaf
0, 45, 45, 1, 304128, 0x41bfcb1b
0, 46, 46, 1, 304128, 0xbecabb09
0, 47, 47, 1, 304128, 0xfa04a0ef
0, 48, 48, 1, 304128, 0xa43d9356
0, 49, 49, 1, 304128, 0x56fd6ae0

51
tests/ref/fate/filter-overlay_yuv420
Unescape View File

@ -0,0 +1,51 @@
#tb 0: 1/25
0, 0, 0, 1, 152064, 0xd5ac29f3
0, 1, 1, 1, 152064, 0x95110a80
0, 2, 2, 1, 152064, 0xe5c59adc
0, 3, 3, 1, 152064, 0xe54df17c
0, 4, 4, 1, 152064, 0xab22e1ac
0, 5, 5, 1, 152064, 0x1a5db284
0, 6, 6, 1, 152064, 0x6ee1895d
0, 7, 7, 1, 152064, 0xb091cdff
0, 8, 8, 1, 152064, 0x4df4dcd3
0, 9, 9, 1, 152064, 0xb00ef49e
0, 10, 10, 1, 152064, 0x11b61be4
0, 11, 11, 1, 152064, 0x4e6d0b38
0, 12, 12, 1, 152064, 0x029d65db
0, 13, 13, 1, 152064, 0x8123d3a6
0, 14, 14, 1, 152064, 0xbdd3701f
0, 15, 15, 1, 152064, 0x958916e7
0, 16, 16, 1, 152064, 0xe7973608
0, 17, 17, 1, 152064, 0xd6be4edf
0, 18, 18, 1, 152064, 0x3571a14f
0, 19, 19, 1, 152064, 0xde150ddd
0, 20, 20, 1, 152064, 0xb5e33eb1
0, 21, 21, 1, 152064, 0xdd258601
0, 22, 22, 1, 152064, 0x4335a59d
0, 23, 23, 1, 152064, 0xa652cb99
0, 24, 24, 1, 152064, 0x42cc6e6e
0, 25, 25, 1, 152064, 0xc7540c4b
0, 26, 26, 1, 152064, 0xb495dc85
0, 27, 27, 1, 152064, 0x2aa11cfa
0, 28, 28, 1, 152064, 0x8e4d44de
0, 29, 29, 1, 152064, 0x2e9e550f
0, 30, 30, 1, 152064, 0x995839ee
0, 31, 31, 1, 152064, 0xb55647d7
0, 32, 32, 1, 152064, 0x7fc556f7
0, 33, 33, 1, 152064, 0x894f9acf
0, 34, 34, 1, 152064, 0x5ea68479
0, 35, 35, 1, 152064, 0x9d0fdb97
0, 36, 36, 1, 152064, 0x8e6d4cff
0, 37, 37, 1, 152064, 0xb315621c
0, 38, 38, 1, 152064, 0x307b23a1
0, 39, 39, 1, 152064, 0x41f246da
0, 40, 40, 1, 152064, 0x8af934d5
0, 41, 41, 1, 152064, 0x5d327ac0
0, 42, 42, 1, 152064, 0x49b46cdf
0, 43, 43, 1, 152064, 0x799eb970
0, 44, 44, 1, 152064, 0x424b88cc
0, 45, 45, 1, 152064, 0xfbcff8df
0, 46, 46, 1, 152064, 0x70f7c722
0, 47, 47, 1, 152064, 0x29a55d83
0, 48, 48, 1, 152064, 0xff2430be
0, 49, 49, 1, 152064, 0x02438701

51
tests/ref/fate/filter-overlay_yuv444
Unescape View File

@ -0,0 +1,51 @@
#tb 0: 1/25
0, 0, 0, 1, 405504, 0xbbfccc5d
0, 1, 1, 1, 405504, 0xac9682d3
0, 2, 2, 1, 405504, 0x6f7426c4
0, 3, 3, 1, 405504, 0x43469a25
0, 4, 4, 1, 405504, 0x75f7e902
0, 5, 5, 1, 405504, 0xad19a433
0, 6, 6, 1, 405504, 0xf11090f3
0, 7, 7, 1, 405504, 0xe8ce9d18
0, 8, 8, 1, 405504, 0xcf24926c
0, 9, 9, 1, 405504, 0x740999d2
0, 10, 10, 1, 405504, 0xb588dabd
0, 11, 11, 1, 405504, 0x3e49d8d1
0, 12, 12, 1, 405504, 0xe3d980ae
0, 13, 13, 1, 405504, 0x70c9c2a3
0, 14, 14, 1, 405504, 0x6b704efc
0, 15, 15, 1, 405504, 0x43e92e97
0, 16, 16, 1, 405504, 0x36c884fa
0, 17, 17, 1, 405504, 0xaf19b6d7
0, 18, 18, 1, 405504, 0x5478dbb2
0, 19, 19, 1, 405504, 0xb09f552c
0, 20, 20, 1, 405504, 0x0bb97177
0, 21, 21, 1, 405504, 0xaf2b8660
0, 22, 22, 1, 405504, 0xe0ef2941
0, 23, 23, 1, 405504, 0x5d934bc5
0, 24, 24, 1, 405504, 0x5fff55ec
0, 25, 25, 1, 405504, 0xcdf4359f
0, 26, 26, 1, 405504, 0x3a773cd9
0, 27, 27, 1, 405504, 0x73991118
0, 28, 28, 1, 405504, 0x7dc1088b
0, 29, 29, 1, 405504, 0x878e06c8
0, 30, 30, 1, 405504, 0xcfee8070
0, 31, 31, 1, 405504, 0x563a6a8b
0, 32, 32, 1, 405504, 0xb6af32d8
0, 33, 33, 1, 405504, 0x7a0e3783
0, 34, 34, 1, 405504, 0xcd3e3835
0, 35, 35, 1, 405504, 0x0e7df06c
0, 36, 36, 1, 405504, 0x61aaa4ff
0, 37, 37, 1, 405504, 0x3c5998cc
0, 38, 38, 1, 405504, 0x81b5c32a
0, 39, 39, 1, 405504, 0xf8ca41ad
0, 40, 40, 1, 405504, 0x109aa08e
0, 41, 41, 1, 405504, 0xb9c6a26f
0, 42, 42, 1, 405504, 0xd221a69f
0, 43, 43, 1, 405504, 0x670bda84
0, 44, 44, 1, 405504, 0xf9903d5b
0, 45, 45, 1, 405504, 0xe19d1db4
0, 46, 46, 1, 405504, 0xcefa1fea
0, 47, 47, 1, 405504, 0x00b9fe31
0, 48, 48, 1, 405504, 0x051a319f
0, 49, 49, 1, 405504, 0x2d73bdd5

0
tests/ref/lavfi/pad → tests/ref/fate/filter-pad
Unescape View File

0
tests/ref/lavfi/pp → tests/ref/fate/filter-pp
Unescape View File

0
tests/ref/lavfi/pp2 → tests/ref/fate/filter-pp2
Unescape View File

0
tests/ref/lavfi/pp3 → tests/ref/fate/filter-pp3
Unescape View File

0
tests/ref/lavfi/pp4 → tests/ref/fate/filter-pp4
Unescape View File

0
tests/ref/lavfi/pp5 → tests/ref/fate/filter-pp5
Unescape View File

0
tests/ref/lavfi/pp6 → tests/ref/fate/filter-pp6
Unescape View File

0
tests/ref/lavfi/select → tests/ref/fate/filter-select
Unescape View File

0
tests/ref/lavfi/setdar → tests/ref/fate/filter-setdar
Unescape View File

0
tests/ref/lavfi/setsar → tests/ref/fate/filter-setsar
Unescape View File

0
tests/ref/lavfi/thumbnail → tests/ref/fate/filter-thumbnail
Unescape View File

0
tests/ref/lavfi/tile → tests/ref/fate/filter-tile
Unescape View File

1
tests/ref/lavfi/drawbox
Unescape View File

@ -1 +0,0 @@
drawbox b6ff6ecda5611de46ed26db05b49dc72

1
tests/ref/lavfi/fade
Unescape View File

@ -1 +0,0 @@
fade 129fb9b266524b0adf102689c366cac8

1
tests/ref/lavfi/overlay_rgb
Unescape View File

@ -1 +0,0 @@
overlay_rgb abea47d9e61d7eab40c4734294519524

1
tests/ref/lavfi/overlay_yuv420
Unescape View File

@ -1 +0,0 @@
overlay_yuv420 4e85d551db9e56e8faddc1fc70fd6a00

1
tests/ref/lavfi/overlay_yuv444
Unescape View File

@ -1 +0,0 @@
overlay_yuv444 16215d0b4054a44bbe7f6c46bd97d235

1
tests/ref/lavfi/unsharp
Unescape View File

@ -1 +0,0 @@
unsharp 7d72d2ab7b7f60159c822a097e01068b
Write Preview
Loading…
Cancel
Save