RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '086a541857812b2e0435db38fbabfddc7d19e53c' 

* commit '086a541857812b2e0435db38fbabfddc7d19e53c':
  fate: png-suite

Conflicts:
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-05 00:43:06 +02:00
parent 700bf1fa4e 086a541857
commit 6b646fb9e2
8 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/fate/image.mak
View File

@ -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

2
tests/ref/fate/png-gray16 Normal file
View File

@ -0,0 +1,2 @@
#tb 0: 1/25
0, 0, 0, 1, 49152, 0xc71b77cd

2
tests/ref/fate/png-gray8 Normal file
View File

@ -0,0 +1,2 @@
#tb 0: 1/25
0, 0, 0, 1, 49152, 0x55121b03

2
tests/ref/fate/png-rgb24 Normal file
View File

@ -0,0 +1,2 @@
#tb 0: 1/25
0, 0, 0, 1, 49152, 0xe0013dee

2
tests/ref/fate/png-rgb48 Normal file
View File

@ -0,0 +1,2 @@
#tb 0: 1/25
0, 0, 0, 1, 49152, 0xcf0e902a

2
tests/ref/fate/png-rgba Normal file
View File

@ -0,0 +1,2 @@
#tb 0: 1/25
0, 0, 0, 1, 49152, 0x5017bc21

2
tests/ref/fate/png-ya16 Normal file
View File

@ -0,0 +1,2 @@
#tb 0: 1/25
0, 0, 0, 1, 49152, 0x93ce1cd5

2
tests/ref/fate/png-ya8 Normal file
View File

@ -0,0 +1,2 @@
#tb 0: 1/25
0, 0, 0, 1, 49152, 0xed73bf03