1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

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>
This commit is contained in:
Michael Niedermayer 2014-08-01 14:33:16 +02:00
commit 713dbe0655
123 changed files with 142 additions and 129 deletions

1
.gitignore vendored
View File

@ -61,6 +61,7 @@
/tests/audiogen
/tests/base64
/tests/data/
/tests/pixfmts.mak
/tests/rotozoom
/tests/tiny_psnr
/tests/tiny_ssim

View File

@ -50,8 +50,10 @@ tests/data/filtergraphs/%: TAG = COPY
tests/data/filtergraphs/%: $(SRC_PATH)/tests/filtergraphs/% | tests/data/filtergraphs
$(M)cp $< $@
RUNNING_FATE := $(filter check fate%,$(filter-out fate-rsync,$(MAKECMDGOALS)))
# Check sanity of dependencies when running FATE tests.
ifneq (,$(filter check fate%,$(filter-out fate-rsync,$(MAKECMDGOALS))))
ifneq (,$(RUNNING_FATE))
CHKCFG = $(if $($(1))$(!$(1)),$($(1)), $(error No such config: $(1)))
endif
@ -209,6 +211,7 @@ testclean:
$(RM) -r tests/vsynth1 tests/data tools/lavfi-showfiltfmts$(EXESUF)
$(RM) $(CLEANSUFFIXES:%=tests/%)
$(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF))
$(RM) tests/pixfmts.mak
-include $(wildcard tests/*.d)

View File

@ -177,14 +177,6 @@ video_filter(){
$FLAGS $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5:
}
pixdesc(){
pix_fmts="$(ffmpeg -pix_fmts list 2>/dev/null | awk 'NR > 8 && /^IO/ { print $2 }' | sort)"
for pix_fmt in $pix_fmts; do
test=$pix_fmt
video_filter "format=$pix_fmt,pixdesctest" -pix_fmt $pix_fmt
done
}
pixfmts(){
filter=${test#filter-pixfmts-}
filter=${filter%_*}

View File

@ -283,8 +283,25 @@ 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
tests/pixfmts.mak: TAG = GEN
tests/pixfmts.mak: ffmpeg$(EXESUF)
$(M)printf "PIXFMTS = " > $@
$(Q)$(TARGET_EXEC) $(TARGET_PATH)/$< -pix_fmts list 2> /dev/null | awk 'NR > 8 && /^IO/ { printf $$2 " " }' >> $@
$(Q)printf "\n" >> $@
ifneq (,$(RUNNING_FATE))
-include tests/pixfmts.mak
endif
define PIXDESC_TEST
FATE_FILTER_PIXDESC-$(CONFIG_FORMAT_FILTER) += fate-filter-pixdesc-$(1)
fate-filter-pixdesc-$(1): CMD = video_filter "format=$(1),pixdesctest" -pix_fmt $(1)
endef
$(foreach fmt, $(PIXFMTS), $(eval $(call PIXDESC_TEST,$(fmt))))
fate-filter-pixdesc: $(FATE_FILTER_PIXDESC-yes)
FATE_FILTER_VSYNTH-yes += $(FATE_FILTER_PIXDESC-yes)
FATE_FILTER_PIXFMTS-$(CONFIG_COPY_FILTER) += fate-filter-pixfmts-copy

View File

@ -1,118 +0,0 @@
0bgr 567bba091d0c8148a892b826c52d1e73
0rgb 81f013e1d0da78e347aac45e57007187
abgr 0d93666da1532ca69c1a3e2ee0248430
argb 86f5041b9245930bc6977d4f2babf74d
bgr0 5f7fdabb606edcd0db80684da021f6c9
bgr24 fd0c957cabb399b3dda29e1190e6cfac
bgr444be 96d828ff1ea24858100e0afcef6f6201
bgr444le 5a43d10a7890378368073be08141f967
bgr48be 65986a0555423c910db4820732565a5e
bgr48le 3050e56ee66fa61d8dd88b12f4b2f956
bgr4_byte 6d8ea0cb6b4cadace60222063a847630
bgr555be 90ffbd6a7850f25253977aecf84e229e
bgr555le 9f800958e9c238c9441fef9799ab2a8d
bgr565be 0e7c46857a3bebc2e3bb77ae68cc0bad
bgr565le 31c0b9b6bc009a4bfa4421c3bbb2ff39
bgr8 775803c35cf19b2fc84f537ce5a7e262
bgra 020a3623e3ad6ea398d6adfcba9e510c
bgra64be ce8e864307b8f11d1bc4a92f3384416b
bgra64le fa2e6435c1f7f498d5714898e120dd89
gbrap dcf43e62881e69a873382c12d3afe0a4
gbrp 78a26e285e0f6ee73f37d70621e659fe
gbrp10be d325f4f209bf460f8ff7d37bc51978dd
gbrp10le c2328ae0384eeb34b1ac83726b385f46
gbrp12be 8aa22995644b2796ecafc10dec5f3bd8
gbrp12le df4badcfdf6701e03809ef5a278297b8
gbrp14be a02a13caee9af458c5039c697ab896a6
gbrp14le 4f521b6e69078bd0eca8dfcfde0f6ef6
gbrp9be 397280799d9e78f48670664491e62524
gbrp9le dbf020fa8423e170f2624ddba9f2c945
gray 19ae78946e6acc3b552daa61b44a8ca1
gray16be 2665aebcabc71b30a2252308b1335a81
gray16le f35d7d9b8cac96c5ac25c2cd4b42443b
monob d2b84b01179f38ce59a7050064d42289
monow 550a446b7900a42990d76befca7f08a0
nv12 18aaac3efcb2e389bfa2ade34b917634
nv21 cb3b54dcc21c72943d496e6368b0c00b
rgb0 62028885ff1adc3368c378748a80be71
rgb24 273cfae99e5951d567f230beec3e3eeb
rgb444be d90556c864a78c45ca9e2c27130067cd
rgb444le fe271368f267be87eb8f5b46335ba6dc
rgb48be 434c2ce989de629050e53e820b6929b6
rgb48le e04c4a36ea9f9c5624ebd56463b593fe
rgb4_byte 77c49fda8c97ffc25678d8a51f7056ca
rgb555be cb820a51149ba9944480bad7e1260abc
rgb555le dc18e2fec8f39ebfd5b479fa6c5fe717
rgb565be 0a7a10645295397cd6cbd6eadce71c8e
rgb565le 7454e27a0e2c2c37c67e5361a82dd445
rgb8 7b602ac8a68dd95ad639f741be805a0d
rgba 283a6115965814470d50f11bf197c5fe
rgba64be a00ce626e8c94dcc2ebd7b95d7a7d43b
rgba64le 50932da874a5063a595a9428edb187fe
uyvy422 2d479ff414d1c94bf506e48c86f66a02
xyz12be ff515a5c7277e411c0bf3c8f26d02de8
xyz12le 63f383905675fd3306a329eb89d6d0f8
yuv410p 242e22aa812c1db8bff7f8132fb1f6da
yuv411p 9305f8baa6ab955566fbee34391734b3
yuv420p 005e6ddc8a5daf11cf866a1ec76c2572
yuv420p10be ac1b6e1050f39464703e78a2ffc1913a
yuv420p10le 5c158075ae335e6bbf4cd3be29bbb62a
yuv420p12be 6a53755f72b37b2a264387dd5604b431
yuv420p12le 174eb0b1aa668d517c13d6e397577cf9
yuv420p14be ea8399e9ef8b6aa033ad2f5d6dca0473
yuv420p14le a63fb4dfb6a7db44a5fd7f35d39d9032
yuv420p16be fa7a59892b9d15f6e41c24e5f348f303
yuv420p16le 5b75c822b20189bb0859b05bcf241aec
yuv420p9be d5dabd911d09c9e8fa01fe284dcfd4d6
yuv420p9le eb1f57241a76ae5d65228adb3aede871
yuv422p 5afc9b0f6c5cef4a7d0543c03d0fc8a4
yuv422p10be b83a73824cf37922faa84227ca151b83
yuv422p10le 64e51f718442560814e74dd1e01d6c94
yuv422p12be 460ce0ef46387d0ee667664e72dfe6d0
yuv422p12le 687856619666bc8f8bc6a8e91f7c4e95
yuv422p14be 461184df05416126fec7c5d2fbad3876
yuv422p14le e180b189ef2f8448c681d02b478e56cd
yuv422p16be 332fba636d33aea23514392d80602a96
yuv422p16le 5d8e26fbbc8f25576065106c8820d56a
yuv422p9be e3b364350da35d2ffd431665ed9d3592
yuv422p9le 0f21976b77781cada504f690d7dc6c15
yuv440p e6754959dfd9631f2dc1682fa71aa4e0
yuv444p db3ad634aea336663a2f5c2475b95410
yuv444p10be e341efd871b34308831113f4b2ff29f9
yuv444p10le f9666d63623e0d7dceda1a17202579cf
yuv444p12be 151c0e12d45ddf475a293cf9eee4c224
yuv444p12le e0da5848e54c3ba0dbfa0414ff4a47f3
yuv444p14be 83d2420dc82158274425c6ea5e396dbf
yuv444p14le 155753892ad8a8957df50033fd21fecb
yuv444p16be 6bb40952bd87aaaf2938cfadd1017a79
yuv444p16le 9be8c3ca67cb8a778d39c087f008d8c0
yuv444p9be 5a54227a9e1e12fd297e36e1e9361c52
yuv444p9le faeeb7f3ff5efc51975d48d49f4ced5d
yuva420p 7b609ede889454d2b89b184c290e9e32
yuva420p10be 4a0ab3165ccc5cde5f4ef9c27e8ccf82
yuva420p10le 8fbcc6200060e0710e5a824b86c9c219
yuva420p16be d149e664c8fce03192d78279472ae2c3
yuva420p16le 11b9f6b757f98fd4a442983bca8945b1
yuva420p9be 0aae288a080fb0acfac23610b2d30111
yuva420p9le fb67be28488cb722d4aea6fe3fdaaa16
yuva422p 88c582f7c6d7c123198fb707aad2d5b0
yuva422p10be 465ec369d7e47a71976821fdc31c289c
yuva422p10le 07df8a8fcb3081e89d84359b178d5260
yuva422p16be 0144a6783d7728a0e66d2b6d1134ecec
yuva422p16le 5b49f7e660c77bafcb03869ea2e1ce02
yuva422p9be 923a2d718c2dcf62c4c9b573a56f15ad
yuva422p9le 9188e6cef21e89d034d37da1b1702a7d
yuva444p f89cdb4fea764921004e149358d7028a
yuva444p10be 87b0f4d461c40bde0cc85b109103d016
yuva444p10le 5aed7ca68d5645a3a9acbe14b8eca54f
yuva444p16be 5701a24fa4153d45be9533d7ec00b660
yuva444p16le c3092fc38248cf96e30dce70208ed360
yuva444p9be 8ab557ee81eae76cd176d998078d671d
yuva444p9le b599165331bd7fa6b05dbf7b80044856
yuvj411p ffb1370ebb9e1bb3b7dd4a532fe8eaeb
yuvj420p aaddf557fa39c3b9521bc6afabbc18e6
yuvj422p 4f46f78ace9176a534aea861ac316441
yuvj440p d8083286cf699e81113fc8ea04ba3c35
yuvj444p cad8f07876e62d33caf6c420d0f67a56
yuyv422 ad9bf7f09f4f8263131649407a778e7b
yvyu422 59f91e478f573d8a305e11da12a87be3

View File

@ -0,0 +1 @@
pixdesc-0bgr 567bba091d0c8148a892b826c52d1e73

View File

@ -0,0 +1 @@
pixdesc-0rgb 81f013e1d0da78e347aac45e57007187

View File

@ -0,0 +1 @@
pixdesc-abgr 0d93666da1532ca69c1a3e2ee0248430

View File

@ -0,0 +1 @@
pixdesc-argb 86f5041b9245930bc6977d4f2babf74d

View File

@ -0,0 +1 @@
pixdesc-bgr0 5f7fdabb606edcd0db80684da021f6c9

View File

@ -0,0 +1 @@
pixdesc-bgr24 fd0c957cabb399b3dda29e1190e6cfac

View File

@ -0,0 +1 @@
pixdesc-bgr444be 96d828ff1ea24858100e0afcef6f6201

View File

@ -0,0 +1 @@
pixdesc-bgr444le 5a43d10a7890378368073be08141f967

View File

@ -0,0 +1 @@
pixdesc-bgr48be 65986a0555423c910db4820732565a5e

View File

@ -0,0 +1 @@
pixdesc-bgr48le 3050e56ee66fa61d8dd88b12f4b2f956

View File

@ -0,0 +1 @@
pixdesc-bgr4_byte 6d8ea0cb6b4cadace60222063a847630

View File

@ -0,0 +1 @@
pixdesc-bgr555be 90ffbd6a7850f25253977aecf84e229e

View File

@ -0,0 +1 @@
pixdesc-bgr555le 9f800958e9c238c9441fef9799ab2a8d

View File

@ -0,0 +1 @@
pixdesc-bgr565be 0e7c46857a3bebc2e3bb77ae68cc0bad

View File

@ -0,0 +1 @@
pixdesc-bgr565le 31c0b9b6bc009a4bfa4421c3bbb2ff39

View File

@ -0,0 +1 @@
pixdesc-bgr8 775803c35cf19b2fc84f537ce5a7e262

View File

@ -0,0 +1 @@
pixdesc-bgra 020a3623e3ad6ea398d6adfcba9e510c

View File

@ -0,0 +1 @@
pixdesc-bgra64be ce8e864307b8f11d1bc4a92f3384416b

View File

@ -0,0 +1 @@
pixdesc-bgra64le fa2e6435c1f7f498d5714898e120dd89

View File

@ -0,0 +1 @@
pixdesc-gbrap dcf43e62881e69a873382c12d3afe0a4

View File

@ -0,0 +1 @@
pixdesc-gbrp 78a26e285e0f6ee73f37d70621e659fe

View File

@ -0,0 +1 @@
pixdesc-gbrp10be d325f4f209bf460f8ff7d37bc51978dd

View File

@ -0,0 +1 @@
pixdesc-gbrp10le c2328ae0384eeb34b1ac83726b385f46

View File

@ -0,0 +1 @@
pixdesc-gbrp12be 8aa22995644b2796ecafc10dec5f3bd8

View File

@ -0,0 +1 @@
pixdesc-gbrp12le df4badcfdf6701e03809ef5a278297b8

View File

@ -0,0 +1 @@
pixdesc-gbrp14be a02a13caee9af458c5039c697ab896a6

View File

@ -0,0 +1 @@
pixdesc-gbrp14le 4f521b6e69078bd0eca8dfcfde0f6ef6

View File

@ -0,0 +1 @@
pixdesc-gbrp9be 397280799d9e78f48670664491e62524

View File

@ -0,0 +1 @@
pixdesc-gbrp9le dbf020fa8423e170f2624ddba9f2c945

View File

@ -0,0 +1 @@
pixdesc-gray 19ae78946e6acc3b552daa61b44a8ca1

View File

@ -0,0 +1 @@
pixdesc-gray16be 2665aebcabc71b30a2252308b1335a81

View File

@ -0,0 +1 @@
pixdesc-gray16le f35d7d9b8cac96c5ac25c2cd4b42443b

View File

@ -0,0 +1 @@
pixdesc-monob d2b84b01179f38ce59a7050064d42289

View File

@ -0,0 +1 @@
pixdesc-monow 550a446b7900a42990d76befca7f08a0

View File

@ -0,0 +1 @@
pixdesc-nv12 18aaac3efcb2e389bfa2ade34b917634

View File

@ -0,0 +1 @@
pixdesc-nv21 cb3b54dcc21c72943d496e6368b0c00b

View File

@ -0,0 +1 @@
pixdesc-rgb0 62028885ff1adc3368c378748a80be71

View File

@ -0,0 +1 @@
pixdesc-rgb24 273cfae99e5951d567f230beec3e3eeb

View File

@ -0,0 +1 @@
pixdesc-rgb444be d90556c864a78c45ca9e2c27130067cd

View File

@ -0,0 +1 @@
pixdesc-rgb444le fe271368f267be87eb8f5b46335ba6dc

View File

@ -0,0 +1 @@
pixdesc-rgb48be 434c2ce989de629050e53e820b6929b6

View File

@ -0,0 +1 @@
pixdesc-rgb48le e04c4a36ea9f9c5624ebd56463b593fe

View File

@ -0,0 +1 @@
pixdesc-rgb4_byte 77c49fda8c97ffc25678d8a51f7056ca

View File

@ -0,0 +1 @@
pixdesc-rgb555be cb820a51149ba9944480bad7e1260abc

View File

@ -0,0 +1 @@
pixdesc-rgb555le dc18e2fec8f39ebfd5b479fa6c5fe717

View File

@ -0,0 +1 @@
pixdesc-rgb565be 0a7a10645295397cd6cbd6eadce71c8e

View File

@ -0,0 +1 @@
pixdesc-rgb565le 7454e27a0e2c2c37c67e5361a82dd445

View File

@ -0,0 +1 @@
pixdesc-rgb8 7b602ac8a68dd95ad639f741be805a0d

View File

@ -0,0 +1 @@
pixdesc-rgba 283a6115965814470d50f11bf197c5fe

View File

@ -0,0 +1 @@
pixdesc-rgba64be a00ce626e8c94dcc2ebd7b95d7a7d43b

View File

@ -0,0 +1 @@
pixdesc-rgba64le 50932da874a5063a595a9428edb187fe

View File

@ -0,0 +1 @@
pixdesc-uyvy422 2d479ff414d1c94bf506e48c86f66a02

View File

@ -0,0 +1 @@
pixdesc-xyz12be ff515a5c7277e411c0bf3c8f26d02de8

View File

@ -0,0 +1 @@
pixdesc-xyz12le 63f383905675fd3306a329eb89d6d0f8

View File

@ -0,0 +1 @@
pixdesc-yuv410p 242e22aa812c1db8bff7f8132fb1f6da

View File

@ -0,0 +1 @@
pixdesc-yuv411p 9305f8baa6ab955566fbee34391734b3

View File

@ -0,0 +1 @@
pixdesc-yuv420p 005e6ddc8a5daf11cf866a1ec76c2572

View File

@ -0,0 +1 @@
pixdesc-yuv420p10be ac1b6e1050f39464703e78a2ffc1913a

View File

@ -0,0 +1 @@
pixdesc-yuv420p10le 5c158075ae335e6bbf4cd3be29bbb62a

View File

@ -0,0 +1 @@
pixdesc-yuv420p12be 6a53755f72b37b2a264387dd5604b431

View File

@ -0,0 +1 @@
pixdesc-yuv420p12le 174eb0b1aa668d517c13d6e397577cf9

View File

@ -0,0 +1 @@
pixdesc-yuv420p14be ea8399e9ef8b6aa033ad2f5d6dca0473

View File

@ -0,0 +1 @@
pixdesc-yuv420p14le a63fb4dfb6a7db44a5fd7f35d39d9032

View File

@ -0,0 +1 @@
pixdesc-yuv420p16be fa7a59892b9d15f6e41c24e5f348f303

View File

@ -0,0 +1 @@
pixdesc-yuv420p16le 5b75c822b20189bb0859b05bcf241aec

View File

@ -0,0 +1 @@
pixdesc-yuv420p9be d5dabd911d09c9e8fa01fe284dcfd4d6

View File

@ -0,0 +1 @@
pixdesc-yuv420p9le eb1f57241a76ae5d65228adb3aede871

View File

@ -0,0 +1 @@
pixdesc-yuv422p 5afc9b0f6c5cef4a7d0543c03d0fc8a4

View File

@ -0,0 +1 @@
pixdesc-yuv422p10be b83a73824cf37922faa84227ca151b83

View File

@ -0,0 +1 @@
pixdesc-yuv422p10le 64e51f718442560814e74dd1e01d6c94

View File

@ -0,0 +1 @@
pixdesc-yuv422p12be 460ce0ef46387d0ee667664e72dfe6d0

View File

@ -0,0 +1 @@
pixdesc-yuv422p12le 687856619666bc8f8bc6a8e91f7c4e95

View File

@ -0,0 +1 @@
pixdesc-yuv422p14be 461184df05416126fec7c5d2fbad3876

View File

@ -0,0 +1 @@
pixdesc-yuv422p14le e180b189ef2f8448c681d02b478e56cd

View File

@ -0,0 +1 @@
pixdesc-yuv422p16be 332fba636d33aea23514392d80602a96

View File

@ -0,0 +1 @@
pixdesc-yuv422p16le 5d8e26fbbc8f25576065106c8820d56a

View File

@ -0,0 +1 @@
pixdesc-yuv422p9be e3b364350da35d2ffd431665ed9d3592

View File

@ -0,0 +1 @@
pixdesc-yuv422p9le 0f21976b77781cada504f690d7dc6c15

View File

@ -0,0 +1 @@
pixdesc-yuv440p e6754959dfd9631f2dc1682fa71aa4e0

View File

@ -0,0 +1 @@
pixdesc-yuv444p db3ad634aea336663a2f5c2475b95410

View File

@ -0,0 +1 @@
pixdesc-yuv444p10be e341efd871b34308831113f4b2ff29f9

View File

@ -0,0 +1 @@
pixdesc-yuv444p10le f9666d63623e0d7dceda1a17202579cf

View File

@ -0,0 +1 @@
pixdesc-yuv444p12be 151c0e12d45ddf475a293cf9eee4c224

View File

@ -0,0 +1 @@
pixdesc-yuv444p12le e0da5848e54c3ba0dbfa0414ff4a47f3

View File

@ -0,0 +1 @@
pixdesc-yuv444p14be 83d2420dc82158274425c6ea5e396dbf

View File

@ -0,0 +1 @@
pixdesc-yuv444p14le 155753892ad8a8957df50033fd21fecb

View File

@ -0,0 +1 @@
pixdesc-yuv444p16be 6bb40952bd87aaaf2938cfadd1017a79

View File

@ -0,0 +1 @@
pixdesc-yuv444p16le 9be8c3ca67cb8a778d39c087f008d8c0

View File

@ -0,0 +1 @@
pixdesc-yuv444p9be 5a54227a9e1e12fd297e36e1e9361c52

View File

@ -0,0 +1 @@
pixdesc-yuv444p9le faeeb7f3ff5efc51975d48d49f4ced5d

View File

@ -0,0 +1 @@
pixdesc-yuva420p 7b609ede889454d2b89b184c290e9e32

View File

@ -0,0 +1 @@
pixdesc-yuva420p10be4a0ab3165ccc5cde5f4ef9c27e8ccf82

View File

@ -0,0 +1 @@
pixdesc-yuva420p10le8fbcc6200060e0710e5a824b86c9c219

View File

@ -0,0 +1 @@
pixdesc-yuva420p16bed149e664c8fce03192d78279472ae2c3

View File

@ -0,0 +1 @@
pixdesc-yuva420p16le11b9f6b757f98fd4a442983bca8945b1

Some files were not shown because too many files have changed in this diff Show More