diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 00:43:06 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 00:53:50 +0200 |
commit | 6b646fb9e2cea927a744dabb7c412a13a13d219d (patch) | |
tree | fe3c30021964f9cd65de96606361e056d69b41ab /tests/fate | |
parent | 700bf1fa4e783ec078615f3b13dfad979f4d2ccf (diff) | |
parent | 086a541857812b2e0435db38fbabfddc7d19e53c (diff) | |
download | ffmpeg-streaming-6b646fb9e2cea927a744dabb7c412a13a13d219d.zip ffmpeg-streaming-6b646fb9e2cea927a744dabb7c412a13a13d219d.tar.gz |
Merge commit '086a541857812b2e0435db38fbabfddc7d19e53c'
* commit '086a541857812b2e0435db38fbabfddc7d19e53c':
fate: png-suite
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
-rw-r--r-- | tests/fate/image.mak | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index cd589f6..89b91aa 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -59,6 +59,18 @@ fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 FATE_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png -pix_fmt rgba +define FATE_IMGSUITE_PNG +FATE_PNG += fate-png-$(1) +fate-png-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/png1/lena-$(1).png -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24 +endef + +PNG_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba ya8 ya16 +$(foreach CLSP,$(PNG_COLORSPACES),$(eval $(call FATE_IMGSUITE_PNG,$(CLSP)))) + +FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG) +FATE_IMAGE += $(FATE_PNG-yes) +fate-png: $(FATE_PNG-yes) + FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 |