From 823fa7004571cb8404ca5785f9fa6e85f0f9f3d3 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Fri, 20 Nov 2015 02:17:35 +0100 Subject: [PATCH] fate: Rework sgi tests into a suite and add the missing ones Signed-off-by: Vittorio Giovara --- tests/fate/image.mak | 33 ++++++-------------------- tests/ref/fate/sgi-gray16 | 2 +- tests/ref/fate/sgi-gray16-rle | 2 ++ tests/ref/fate/{sgi-gray => sgi-gray8} | 0 tests/ref/fate/sgi-gray8-rle | 2 ++ tests/ref/fate/sgi-rgba-rle | 2 ++ tests/ref/fate/sgi-rgba64-rle | 2 +- 7 files changed, 15 insertions(+), 28 deletions(-) create mode 100644 tests/ref/fate/sgi-gray16-rle rename tests/ref/fate/{sgi-gray => sgi-gray8} (100%) create mode 100644 tests/ref/fate/sgi-gray8-rle create mode 100644 tests/ref/fate/sgi-rgba-rle diff --git a/tests/fate/image.mak b/tests/fate/image.mak index b7cc30e33d..f7b05ae6d6 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -94,35 +94,16 @@ fate-png: $(FATE_PNG-yes) FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PTX) += fate-ptx fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 -FATE_SGI += fate-sgi-gray -fate-sgi-gray: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/vulap_gray.sgi -pix_fmt gray +define FATE_IMGSUITE_SGI +FATE_SGI += fate-sgi-$(1) fate-sgi-$(1)-rle +fate-sgi-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/sgi/libav_$(1).sgi -sws_flags +accurate_rnd+bitexact +fate-sgi-$(1)-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/libav_$(1)_rle.sgi -sws_flags +accurate_rnd+bitexact +endef -FATE_SGI += fate-sgi-gray16 -fate-sgi-gray16: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/vulap_gray16.sgi -pix_fmt gray16le - -FATE_SGI += fate-sgi-rgb24 -fate-sgi-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/vulap_rgb24.sgi -pix_fmt rgb24 - -FATE_SGI += fate-sgi-rgb24-rle -fate-sgi-rgb24-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/uvmap_rgb24_rle.sgi -pix_fmt rgb24 - -FATE_SGI += fate-sgi-rgb48 -fate-sgi-rgb48: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/vulap_rgb48.sgi -pix_fmt rgb48be - -FATE_SGI += fate-sgi-rgb48-rle -fate-sgi-rgb48-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/uvmap_rgb48_rle.sgi -pix_fmt rgb48be - -FATE_SGI += fate-sgi-rgba -fate-sgi-rgba: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/vulap_rgba.sgi -pix_fmt rgba - -FATE_SGI += fate-sgi-rgba64 -fate-sgi-rgba64: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/vulap_rgba64.sgi -pix_fmt rgba64be - -FATE_SGI += fate-sgi-rgba64-rle -fate-sgi-rgba64-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/maya_rgba64_rle.sgi -pix_fmt rgba64be +SGI_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba rgba64 +$(foreach CLSP,$(SGI_COLORSPACES),$(eval $(call FATE_IMGSUITE_SGI,$(CLSP)))) FATE_SGI-$(call DEMDEC, IMAGE2, SGI) += $(FATE_SGI) - FATE_SAMPLES_AVCONV += $(FATE_SGI-yes) fate-sgi: $(FATE_SGI-yes) diff --git a/tests/ref/fate/sgi-gray16 b/tests/ref/fate/sgi-gray16 index 3218edc1b2..0908746a76 100644 --- a/tests/ref/fate/sgi-gray16 +++ b/tests/ref/fate/sgi-gray16 @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 262144, 0xecdaf084 +0, 0, 0, 1, 262144, 0x6c27f084 diff --git a/tests/ref/fate/sgi-gray16-rle b/tests/ref/fate/sgi-gray16-rle new file mode 100644 index 0000000000..09903d5ba9 --- /dev/null +++ b/tests/ref/fate/sgi-gray16-rle @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 262144, 0x65ef57ff diff --git a/tests/ref/fate/sgi-gray b/tests/ref/fate/sgi-gray8 similarity index 100% rename from tests/ref/fate/sgi-gray rename to tests/ref/fate/sgi-gray8 diff --git a/tests/ref/fate/sgi-gray8-rle b/tests/ref/fate/sgi-gray8-rle new file mode 100644 index 0000000000..b0e060699c --- /dev/null +++ b/tests/ref/fate/sgi-gray8-rle @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 131072, 0xb0702a94 diff --git a/tests/ref/fate/sgi-rgba-rle b/tests/ref/fate/sgi-rgba-rle new file mode 100644 index 0000000000..058f5f99c3 --- /dev/null +++ b/tests/ref/fate/sgi-rgba-rle @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 524288, 0x4ee5adbb diff --git a/tests/ref/fate/sgi-rgba64-rle b/tests/ref/fate/sgi-rgba64-rle index 1dfac760fc..cdf5fd0e32 100644 --- a/tests/ref/fate/sgi-rgba64-rle +++ b/tests/ref/fate/sgi-rgba64-rle @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 614400, 0xb92d409d +0, 0, 0, 1, 1048576, 0xb619d0f1