fate: Rework sgi tests into a suite and add the missing ones

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index b7cc30e33d57a328ed80291306bc419c8a71b1df..f7b05ae6d67d20ef7fc6464cc56c9e7c99cf8ee3 100644 (file)
--- 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
-
-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
+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-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 3218edc1b2eb55b0b285e1d365d5232f3196753f..0908746a76b4e3f4b512d29d41541ef5195df502 100644 (file)
--- 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 (file)
index 0000000..09903d5
--- /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 (file)
index 0000000..b0e0606
--- /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 (file)
index 0000000..058f5f9
--- /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 1dfac760fc09e5c30cf8b884fb4906ed30339a08..cdf5fd0e32cec6ea2287cdee8c018c4da438787c 100644 (file)
--- 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