Browse code
Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'
* commit '706208ef47bffd525c982975d2756f7b2b220b8d':
fate: Split fate-pixdesc tests and dispatch them through Make
Conflicts:
tests/fate-run.sh
tests/ref/fate/filter-pixdesc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer authored on 2014/08/01 21:33:16Showing 123 changed files
- .gitignore
- tests/Makefile
- tests/fate-run.sh
- tests/fate/filter-video.mak
- tests/ref/fate/filter-pixdesc
- tests/ref/fate/filter-pixdesc-0bgr
- tests/ref/fate/filter-pixdesc-0rgb
- tests/ref/fate/filter-pixdesc-abgr
- tests/ref/fate/filter-pixdesc-argb
- tests/ref/fate/filter-pixdesc-bgr0
- tests/ref/fate/filter-pixdesc-bgr24
- tests/ref/fate/filter-pixdesc-bgr444be
- tests/ref/fate/filter-pixdesc-bgr444le
- tests/ref/fate/filter-pixdesc-bgr48be
- tests/ref/fate/filter-pixdesc-bgr48le
- tests/ref/fate/filter-pixdesc-bgr4_byte
- tests/ref/fate/filter-pixdesc-bgr555be
- tests/ref/fate/filter-pixdesc-bgr555le
- tests/ref/fate/filter-pixdesc-bgr565be
- tests/ref/fate/filter-pixdesc-bgr565le
- tests/ref/fate/filter-pixdesc-bgr8
- tests/ref/fate/filter-pixdesc-bgra
- tests/ref/fate/filter-pixdesc-bgra64be
- tests/ref/fate/filter-pixdesc-bgra64le
- tests/ref/fate/filter-pixdesc-gbrap
- tests/ref/fate/filter-pixdesc-gbrp
- tests/ref/fate/filter-pixdesc-gbrp10be
- tests/ref/fate/filter-pixdesc-gbrp10le
- tests/ref/fate/filter-pixdesc-gbrp12be
- tests/ref/fate/filter-pixdesc-gbrp12le
- tests/ref/fate/filter-pixdesc-gbrp14be
- tests/ref/fate/filter-pixdesc-gbrp14le
- tests/ref/fate/filter-pixdesc-gbrp9be
- tests/ref/fate/filter-pixdesc-gbrp9le
- tests/ref/fate/filter-pixdesc-gray
- tests/ref/fate/filter-pixdesc-gray16be
- tests/ref/fate/filter-pixdesc-gray16le
- tests/ref/fate/filter-pixdesc-monob
- tests/ref/fate/filter-pixdesc-monow
- tests/ref/fate/filter-pixdesc-nv12
- tests/ref/fate/filter-pixdesc-nv21
- tests/ref/fate/filter-pixdesc-rgb0
- tests/ref/fate/filter-pixdesc-rgb24
- tests/ref/fate/filter-pixdesc-rgb444be
- tests/ref/fate/filter-pixdesc-rgb444le
- tests/ref/fate/filter-pixdesc-rgb48be
- tests/ref/fate/filter-pixdesc-rgb48le
- tests/ref/fate/filter-pixdesc-rgb4_byte
- tests/ref/fate/filter-pixdesc-rgb555be
- tests/ref/fate/filter-pixdesc-rgb555le
- tests/ref/fate/filter-pixdesc-rgb565be
- tests/ref/fate/filter-pixdesc-rgb565le
- tests/ref/fate/filter-pixdesc-rgb8
- tests/ref/fate/filter-pixdesc-rgba
- tests/ref/fate/filter-pixdesc-rgba64be
- tests/ref/fate/filter-pixdesc-rgba64le
- tests/ref/fate/filter-pixdesc-uyvy422
- tests/ref/fate/filter-pixdesc-xyz12be
- tests/ref/fate/filter-pixdesc-xyz12le
- tests/ref/fate/filter-pixdesc-yuv410p
- tests/ref/fate/filter-pixdesc-yuv411p
- tests/ref/fate/filter-pixdesc-yuv420p
- tests/ref/fate/filter-pixdesc-yuv420p10be
- tests/ref/fate/filter-pixdesc-yuv420p10le
- tests/ref/fate/filter-pixdesc-yuv420p12be
- tests/ref/fate/filter-pixdesc-yuv420p12le
- tests/ref/fate/filter-pixdesc-yuv420p14be
- tests/ref/fate/filter-pixdesc-yuv420p14le
- tests/ref/fate/filter-pixdesc-yuv420p16be
- tests/ref/fate/filter-pixdesc-yuv420p16le
- tests/ref/fate/filter-pixdesc-yuv420p9be
- tests/ref/fate/filter-pixdesc-yuv420p9le
- tests/ref/fate/filter-pixdesc-yuv422p
- tests/ref/fate/filter-pixdesc-yuv422p10be
- tests/ref/fate/filter-pixdesc-yuv422p10le
- tests/ref/fate/filter-pixdesc-yuv422p12be
- tests/ref/fate/filter-pixdesc-yuv422p12le
- tests/ref/fate/filter-pixdesc-yuv422p14be
- tests/ref/fate/filter-pixdesc-yuv422p14le
- tests/ref/fate/filter-pixdesc-yuv422p16be
- tests/ref/fate/filter-pixdesc-yuv422p16le
- tests/ref/fate/filter-pixdesc-yuv422p9be
- tests/ref/fate/filter-pixdesc-yuv422p9le
- tests/ref/fate/filter-pixdesc-yuv440p
- tests/ref/fate/filter-pixdesc-yuv444p
- tests/ref/fate/filter-pixdesc-yuv444p10be
- tests/ref/fate/filter-pixdesc-yuv444p10le
- tests/ref/fate/filter-pixdesc-yuv444p12be
- tests/ref/fate/filter-pixdesc-yuv444p12le
- tests/ref/fate/filter-pixdesc-yuv444p14be
- tests/ref/fate/filter-pixdesc-yuv444p14le
- tests/ref/fate/filter-pixdesc-yuv444p16be
- tests/ref/fate/filter-pixdesc-yuv444p16le
- tests/ref/fate/filter-pixdesc-yuv444p9be
- tests/ref/fate/filter-pixdesc-yuv444p9le
- tests/ref/fate/filter-pixdesc-yuva420p
- tests/ref/fate/filter-pixdesc-yuva420p10be
- tests/ref/fate/filter-pixdesc-yuva420p10le
- tests/ref/fate/filter-pixdesc-yuva420p16be
- tests/ref/fate/filter-pixdesc-yuva420p16le
- tests/ref/fate/filter-pixdesc-yuva420p9be
- tests/ref/fate/filter-pixdesc-yuva420p9le
- tests/ref/fate/filter-pixdesc-yuva422p
- tests/ref/fate/filter-pixdesc-yuva422p10be
- tests/ref/fate/filter-pixdesc-yuva422p10le
- tests/ref/fate/filter-pixdesc-yuva422p16be
- tests/ref/fate/filter-pixdesc-yuva422p16le
- tests/ref/fate/filter-pixdesc-yuva422p9be
- tests/ref/fate/filter-pixdesc-yuva422p9le
- tests/ref/fate/filter-pixdesc-yuva444p
- tests/ref/fate/filter-pixdesc-yuva444p10be
- tests/ref/fate/filter-pixdesc-yuva444p10le
- tests/ref/fate/filter-pixdesc-yuva444p16be
- tests/ref/fate/filter-pixdesc-yuva444p16le
- tests/ref/fate/filter-pixdesc-yuva444p9be
- tests/ref/fate/filter-pixdesc-yuva444p9le
- tests/ref/fate/filter-pixdesc-yuvj411p
- tests/ref/fate/filter-pixdesc-yuvj420p
- tests/ref/fate/filter-pixdesc-yuvj422p
- tests/ref/fate/filter-pixdesc-yuvj440p
- tests/ref/fate/filter-pixdesc-yuvj444p
- tests/ref/fate/filter-pixdesc-yuyv422
- tests/ref/fate/filter-pixdesc-yvyu422
| ... | ... |
@@ -50,8 +50,10 @@ tests/data/filtergraphs/%: TAG = COPY |
| 50 | 50 |
tests/data/filtergraphs/%: $(SRC_PATH)/tests/filtergraphs/% | tests/data/filtergraphs |
| 51 | 51 |
$(M)cp $< $@ |
| 52 | 52 |
|
| 53 |
+RUNNING_FATE := $(filter check fate%,$(filter-out fate-rsync,$(MAKECMDGOALS))) |
|
| 54 |
+ |
|
| 53 | 55 |
# Check sanity of dependencies when running FATE tests. |
| 54 |
-ifneq (,$(filter check fate%,$(filter-out fate-rsync,$(MAKECMDGOALS)))) |
|
| 56 |
+ifneq (,$(RUNNING_FATE)) |
|
| 55 | 57 |
CHKCFG = $(if $($(1))$(!$(1)),$($(1)), $(error No such config: $(1))) |
| 56 | 58 |
endif |
| 57 | 59 |
|
| ... | ... |
@@ -209,6 +211,7 @@ testclean: |
| 209 | 209 |
$(RM) -r tests/vsynth1 tests/data tools/lavfi-showfiltfmts$(EXESUF) |
| 210 | 210 |
$(RM) $(CLEANSUFFIXES:%=tests/%) |
| 211 | 211 |
$(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF)) |
| 212 |
+ $(RM) tests/pixfmts.mak |
|
| 212 | 213 |
|
| 213 | 214 |
-include $(wildcard tests/*.d) |
| 214 | 215 |
|
| ... | ... |
@@ -177,14 +177,6 @@ video_filter(){
|
| 177 | 177 |
$FLAGS $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5: |
| 178 | 178 |
} |
| 179 | 179 |
|
| 180 |
-pixdesc(){
|
|
| 181 |
- pix_fmts="$(ffmpeg -pix_fmts list 2>/dev/null | awk 'NR > 8 && /^IO/ { print $2 }' | sort)"
|
|
| 182 |
- for pix_fmt in $pix_fmts; do |
|
| 183 |
- test=$pix_fmt |
|
| 184 |
- video_filter "format=$pix_fmt,pixdesctest" -pix_fmt $pix_fmt |
|
| 185 |
- done |
|
| 186 |
-} |
|
| 187 |
- |
|
| 188 | 180 |
pixfmts(){
|
| 189 | 181 |
filter=${test#filter-pixfmts-}
|
| 190 | 182 |
filter=${filter%_*}
|
| ... | ... |
@@ -283,8 +283,25 @@ FATE_FILTER_VSYNTH-$(CONFIG_TILE_FILTER) += fate-filter-tile |
| 283 | 283 |
fate-filter-tile: CMD = video_filter "tile=3x3:nb_frames=5:padding=7:margin=2" |
| 284 | 284 |
|
| 285 | 285 |
|
| 286 |
-FATE_FILTER_VSYNTH-$(CONFIG_FORMAT_FILTER) += fate-filter-pixdesc |
|
| 287 |
-fate-filter-pixdesc: CMD = pixdesc |
|
| 286 |
+tests/pixfmts.mak: TAG = GEN |
|
| 287 |
+tests/pixfmts.mak: ffmpeg$(EXESUF) |
|
| 288 |
+ $(M)printf "PIXFMTS = " > $@ |
|
| 289 |
+ $(Q)$(TARGET_EXEC) $(TARGET_PATH)/$< -pix_fmts list 2> /dev/null | awk 'NR > 8 && /^IO/ { printf $$2 " " }' >> $@
|
|
| 290 |
+ $(Q)printf "\n" >> $@ |
|
| 291 |
+ |
|
| 292 |
+ifneq (,$(RUNNING_FATE)) |
|
| 293 |
+-include tests/pixfmts.mak |
|
| 294 |
+endif |
|
| 295 |
+ |
|
| 296 |
+define PIXDESC_TEST |
|
| 297 |
+FATE_FILTER_PIXDESC-$(CONFIG_FORMAT_FILTER) += fate-filter-pixdesc-$(1) |
|
| 298 |
+fate-filter-pixdesc-$(1): CMD = video_filter "format=$(1),pixdesctest" -pix_fmt $(1) |
|
| 299 |
+endef |
|
| 300 |
+ |
|
| 301 |
+$(foreach fmt, $(PIXFMTS), $(eval $(call PIXDESC_TEST,$(fmt)))) |
|
| 302 |
+ |
|
| 303 |
+fate-filter-pixdesc: $(FATE_FILTER_PIXDESC-yes) |
|
| 304 |
+FATE_FILTER_VSYNTH-yes += $(FATE_FILTER_PIXDESC-yes) |
|
| 288 | 305 |
|
| 289 | 306 |
|
| 290 | 307 |
FATE_FILTER_PIXFMTS-$(CONFIG_COPY_FILTER) += fate-filter-pixfmts-copy |
| 291 | 308 |
deleted file mode 100644 |
| ... | ... |
@@ -1,118 +0,0 @@ |
| 1 |
-0bgr 567bba091d0c8148a892b826c52d1e73 |
|
| 2 |
-0rgb 81f013e1d0da78e347aac45e57007187 |
|
| 3 |
-abgr 0d93666da1532ca69c1a3e2ee0248430 |
|
| 4 |
-argb 86f5041b9245930bc6977d4f2babf74d |
|
| 5 |
-bgr0 5f7fdabb606edcd0db80684da021f6c9 |
|
| 6 |
-bgr24 fd0c957cabb399b3dda29e1190e6cfac |
|
| 7 |
-bgr444be 96d828ff1ea24858100e0afcef6f6201 |
|
| 8 |
-bgr444le 5a43d10a7890378368073be08141f967 |
|
| 9 |
-bgr48be 65986a0555423c910db4820732565a5e |
|
| 10 |
-bgr48le 3050e56ee66fa61d8dd88b12f4b2f956 |
|
| 11 |
-bgr4_byte 6d8ea0cb6b4cadace60222063a847630 |
|
| 12 |
-bgr555be 90ffbd6a7850f25253977aecf84e229e |
|
| 13 |
-bgr555le 9f800958e9c238c9441fef9799ab2a8d |
|
| 14 |
-bgr565be 0e7c46857a3bebc2e3bb77ae68cc0bad |
|
| 15 |
-bgr565le 31c0b9b6bc009a4bfa4421c3bbb2ff39 |
|
| 16 |
-bgr8 775803c35cf19b2fc84f537ce5a7e262 |
|
| 17 |
-bgra 020a3623e3ad6ea398d6adfcba9e510c |
|
| 18 |
-bgra64be ce8e864307b8f11d1bc4a92f3384416b |
|
| 19 |
-bgra64le fa2e6435c1f7f498d5714898e120dd89 |
|
| 20 |
-gbrap dcf43e62881e69a873382c12d3afe0a4 |
|
| 21 |
-gbrp 78a26e285e0f6ee73f37d70621e659fe |
|
| 22 |
-gbrp10be d325f4f209bf460f8ff7d37bc51978dd |
|
| 23 |
-gbrp10le c2328ae0384eeb34b1ac83726b385f46 |
|
| 24 |
-gbrp12be 8aa22995644b2796ecafc10dec5f3bd8 |
|
| 25 |
-gbrp12le df4badcfdf6701e03809ef5a278297b8 |
|
| 26 |
-gbrp14be a02a13caee9af458c5039c697ab896a6 |
|
| 27 |
-gbrp14le 4f521b6e69078bd0eca8dfcfde0f6ef6 |
|
| 28 |
-gbrp9be 397280799d9e78f48670664491e62524 |
|
| 29 |
-gbrp9le dbf020fa8423e170f2624ddba9f2c945 |
|
| 30 |
-gray 19ae78946e6acc3b552daa61b44a8ca1 |
|
| 31 |
-gray16be 2665aebcabc71b30a2252308b1335a81 |
|
| 32 |
-gray16le f35d7d9b8cac96c5ac25c2cd4b42443b |
|
| 33 |
-monob d2b84b01179f38ce59a7050064d42289 |
|
| 34 |
-monow 550a446b7900a42990d76befca7f08a0 |
|
| 35 |
-nv12 18aaac3efcb2e389bfa2ade34b917634 |
|
| 36 |
-nv21 cb3b54dcc21c72943d496e6368b0c00b |
|
| 37 |
-rgb0 62028885ff1adc3368c378748a80be71 |
|
| 38 |
-rgb24 273cfae99e5951d567f230beec3e3eeb |
|
| 39 |
-rgb444be d90556c864a78c45ca9e2c27130067cd |
|
| 40 |
-rgb444le fe271368f267be87eb8f5b46335ba6dc |
|
| 41 |
-rgb48be 434c2ce989de629050e53e820b6929b6 |
|
| 42 |
-rgb48le e04c4a36ea9f9c5624ebd56463b593fe |
|
| 43 |
-rgb4_byte 77c49fda8c97ffc25678d8a51f7056ca |
|
| 44 |
-rgb555be cb820a51149ba9944480bad7e1260abc |
|
| 45 |
-rgb555le dc18e2fec8f39ebfd5b479fa6c5fe717 |
|
| 46 |
-rgb565be 0a7a10645295397cd6cbd6eadce71c8e |
|
| 47 |
-rgb565le 7454e27a0e2c2c37c67e5361a82dd445 |
|
| 48 |
-rgb8 7b602ac8a68dd95ad639f741be805a0d |
|
| 49 |
-rgba 283a6115965814470d50f11bf197c5fe |
|
| 50 |
-rgba64be a00ce626e8c94dcc2ebd7b95d7a7d43b |
|
| 51 |
-rgba64le 50932da874a5063a595a9428edb187fe |
|
| 52 |
-uyvy422 2d479ff414d1c94bf506e48c86f66a02 |
|
| 53 |
-xyz12be ff515a5c7277e411c0bf3c8f26d02de8 |
|
| 54 |
-xyz12le 63f383905675fd3306a329eb89d6d0f8 |
|
| 55 |
-yuv410p 242e22aa812c1db8bff7f8132fb1f6da |
|
| 56 |
-yuv411p 9305f8baa6ab955566fbee34391734b3 |
|
| 57 |
-yuv420p 005e6ddc8a5daf11cf866a1ec76c2572 |
|
| 58 |
-yuv420p10be ac1b6e1050f39464703e78a2ffc1913a |
|
| 59 |
-yuv420p10le 5c158075ae335e6bbf4cd3be29bbb62a |
|
| 60 |
-yuv420p12be 6a53755f72b37b2a264387dd5604b431 |
|
| 61 |
-yuv420p12le 174eb0b1aa668d517c13d6e397577cf9 |
|
| 62 |
-yuv420p14be ea8399e9ef8b6aa033ad2f5d6dca0473 |
|
| 63 |
-yuv420p14le a63fb4dfb6a7db44a5fd7f35d39d9032 |
|
| 64 |
-yuv420p16be fa7a59892b9d15f6e41c24e5f348f303 |
|
| 65 |
-yuv420p16le 5b75c822b20189bb0859b05bcf241aec |
|
| 66 |
-yuv420p9be d5dabd911d09c9e8fa01fe284dcfd4d6 |
|
| 67 |
-yuv420p9le eb1f57241a76ae5d65228adb3aede871 |
|
| 68 |
-yuv422p 5afc9b0f6c5cef4a7d0543c03d0fc8a4 |
|
| 69 |
-yuv422p10be b83a73824cf37922faa84227ca151b83 |
|
| 70 |
-yuv422p10le 64e51f718442560814e74dd1e01d6c94 |
|
| 71 |
-yuv422p12be 460ce0ef46387d0ee667664e72dfe6d0 |
|
| 72 |
-yuv422p12le 687856619666bc8f8bc6a8e91f7c4e95 |
|
| 73 |
-yuv422p14be 461184df05416126fec7c5d2fbad3876 |
|
| 74 |
-yuv422p14le e180b189ef2f8448c681d02b478e56cd |
|
| 75 |
-yuv422p16be 332fba636d33aea23514392d80602a96 |
|
| 76 |
-yuv422p16le 5d8e26fbbc8f25576065106c8820d56a |
|
| 77 |
-yuv422p9be e3b364350da35d2ffd431665ed9d3592 |
|
| 78 |
-yuv422p9le 0f21976b77781cada504f690d7dc6c15 |
|
| 79 |
-yuv440p e6754959dfd9631f2dc1682fa71aa4e0 |
|
| 80 |
-yuv444p db3ad634aea336663a2f5c2475b95410 |
|
| 81 |
-yuv444p10be e341efd871b34308831113f4b2ff29f9 |
|
| 82 |
-yuv444p10le f9666d63623e0d7dceda1a17202579cf |
|
| 83 |
-yuv444p12be 151c0e12d45ddf475a293cf9eee4c224 |
|
| 84 |
-yuv444p12le e0da5848e54c3ba0dbfa0414ff4a47f3 |
|
| 85 |
-yuv444p14be 83d2420dc82158274425c6ea5e396dbf |
|
| 86 |
-yuv444p14le 155753892ad8a8957df50033fd21fecb |
|
| 87 |
-yuv444p16be 6bb40952bd87aaaf2938cfadd1017a79 |
|
| 88 |
-yuv444p16le 9be8c3ca67cb8a778d39c087f008d8c0 |
|
| 89 |
-yuv444p9be 5a54227a9e1e12fd297e36e1e9361c52 |
|
| 90 |
-yuv444p9le faeeb7f3ff5efc51975d48d49f4ced5d |
|
| 91 |
-yuva420p 7b609ede889454d2b89b184c290e9e32 |
|
| 92 |
-yuva420p10be 4a0ab3165ccc5cde5f4ef9c27e8ccf82 |
|
| 93 |
-yuva420p10le 8fbcc6200060e0710e5a824b86c9c219 |
|
| 94 |
-yuva420p16be d149e664c8fce03192d78279472ae2c3 |
|
| 95 |
-yuva420p16le 11b9f6b757f98fd4a442983bca8945b1 |
|
| 96 |
-yuva420p9be 0aae288a080fb0acfac23610b2d30111 |
|
| 97 |
-yuva420p9le fb67be28488cb722d4aea6fe3fdaaa16 |
|
| 98 |
-yuva422p 88c582f7c6d7c123198fb707aad2d5b0 |
|
| 99 |
-yuva422p10be 465ec369d7e47a71976821fdc31c289c |
|
| 100 |
-yuva422p10le 07df8a8fcb3081e89d84359b178d5260 |
|
| 101 |
-yuva422p16be 0144a6783d7728a0e66d2b6d1134ecec |
|
| 102 |
-yuva422p16le 5b49f7e660c77bafcb03869ea2e1ce02 |
|
| 103 |
-yuva422p9be 923a2d718c2dcf62c4c9b573a56f15ad |
|
| 104 |
-yuva422p9le 9188e6cef21e89d034d37da1b1702a7d |
|
| 105 |
-yuva444p f89cdb4fea764921004e149358d7028a |
|
| 106 |
-yuva444p10be 87b0f4d461c40bde0cc85b109103d016 |
|
| 107 |
-yuva444p10le 5aed7ca68d5645a3a9acbe14b8eca54f |
|
| 108 |
-yuva444p16be 5701a24fa4153d45be9533d7ec00b660 |
|
| 109 |
-yuva444p16le c3092fc38248cf96e30dce70208ed360 |
|
| 110 |
-yuva444p9be 8ab557ee81eae76cd176d998078d671d |
|
| 111 |
-yuva444p9le b599165331bd7fa6b05dbf7b80044856 |
|
| 112 |
-yuvj411p ffb1370ebb9e1bb3b7dd4a532fe8eaeb |
|
| 113 |
-yuvj420p aaddf557fa39c3b9521bc6afabbc18e6 |
|
| 114 |
-yuvj422p 4f46f78ace9176a534aea861ac316441 |
|
| 115 |
-yuvj440p d8083286cf699e81113fc8ea04ba3c35 |
|
| 116 |
-yuvj444p cad8f07876e62d33caf6c420d0f67a56 |
|
| 117 |
-yuyv422 ad9bf7f09f4f8263131649407a778e7b |
|
| 118 |
-yvyu422 59f91e478f573d8a305e11da12a87be3 |