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 | |
| parent | 700bf1fa4e783ec078615f3b13dfad979f4d2ccf (diff) | |
| parent | 086a541857812b2e0435db38fbabfddc7d19e53c (diff) | |
| download | ffmpeg-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')
| -rw-r--r-- | tests/fate/image.mak | 12 | ||||
| -rw-r--r-- | tests/ref/fate/png-gray16 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/png-gray8 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/png-rgb24 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/png-rgb48 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/png-rgba | 2 | ||||
| -rw-r--r-- | tests/ref/fate/png-ya16 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/png-ya8 | 2 |
8 files changed, 26 insertions, 0 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index cd589f69cc..89b91aa189 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 diff --git a/tests/ref/fate/png-gray16 b/tests/ref/fate/png-gray16 new file mode 100644 index 0000000000..66fc601850 --- /dev/null +++ b/tests/ref/fate/png-gray16 @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 49152, 0xc71b77cd diff --git a/tests/ref/fate/png-gray8 b/tests/ref/fate/png-gray8 new file mode 100644 index 0000000000..9d30db6516 --- /dev/null +++ b/tests/ref/fate/png-gray8 @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 49152, 0x55121b03 diff --git a/tests/ref/fate/png-rgb24 b/tests/ref/fate/png-rgb24 new file mode 100644 index 0000000000..c383836853 --- /dev/null +++ b/tests/ref/fate/png-rgb24 @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 49152, 0xe0013dee diff --git a/tests/ref/fate/png-rgb48 b/tests/ref/fate/png-rgb48 new file mode 100644 index 0000000000..b1159f1867 --- /dev/null +++ b/tests/ref/fate/png-rgb48 @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 49152, 0xcf0e902a diff --git a/tests/ref/fate/png-rgba b/tests/ref/fate/png-rgba new file mode 100644 index 0000000000..f20fe0c693 --- /dev/null +++ b/tests/ref/fate/png-rgba @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 49152, 0x5017bc21 diff --git a/tests/ref/fate/png-ya16 b/tests/ref/fate/png-ya16 new file mode 100644 index 0000000000..07906c4a70 --- /dev/null +++ b/tests/ref/fate/png-ya16 @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 49152, 0x93ce1cd5 diff --git a/tests/ref/fate/png-ya8 b/tests/ref/fate/png-ya8 new file mode 100644 index 0000000000..3a5c99d9eb --- /dev/null +++ b/tests/ref/fate/png-ya8 @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 49152, 0xed73bf03 |