Merge remote-tracking branch 'qatar/master'

[ffmpeg] / tests / fate / image.mak

diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index 153a4f397efc36eef990242e24d2edd062485620..60c6cb26ef54956e27e575bcd1facdf6aad14092 100644 (file)
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -1,41 +1,43 @@
-FATE_TESTS += fate-dpx
+FATE_IMAGE += fate-dpx
 fate-dpx: CMD = framecrc -i $(SAMPLES)/dpx/lighthouse_rgb48.dpx
 
-FATE_TESTS += fate-fax-g3
-fate-fax-g3: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31D.TIF
-
-FATE_TESTS += fate-fax-g3s
-fate-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF
-
-FATE_TESTS += fate-pictor
+FATE_IMAGE += fate-pictor
 fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
 
-FATE_TESTS += fate-ptx
+FATE_IMAGE += fate-ptx
 fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
 
-FATE_TESTS += fate-sunraster-1bit-raw
+FATE_SUNRASTER += fate-sunraster-1bit-raw
 fate-sunraster-1bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-1bit-raw.sun
 
-FATE_TESTS += fate-sunraster-1bit-rle
+FATE_SUNRASTER += fate-sunraster-1bit-rle
 fate-sunraster-1bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-1bit-rle.sun
 
-FATE_TESTS += fate-sunraster-8bit-raw
+FATE_SUNRASTER += fate-sunraster-8bit-raw
 fate-sunraster-8bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-8bit-raw.sun -pix_fmt rgb24
 
-FATE_TESTS += fate-sunraster-8bit-rle
+FATE_SUNRASTER += fate-sunraster-8bit_gray-raw
+fate-sunraster-8bit_gray-raw: CMD = framecrc -i $(SAMPLES)/sunraster/gray.ras
+
+FATE_SUNRASTER += fate-sunraster-8bit-rle
 fate-sunraster-8bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24
 
-FATE_TESTS += fate-sunraster-24bit-raw
+FATE_SUNRASTER += fate-sunraster-24bit-raw
 fate-sunraster-24bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-raw.sun
 
-FATE_TESTS += fate-sunraster-24bit-rle
+FATE_SUNRASTER += fate-sunraster-24bit-rle
 fate-sunraster-24bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-rle.sun
 
+FATE_IMAGE += $(FATE_SUNRASTER)
+fate-sunraster: $(FATE_SUNRASTER)
+
 FATE_TARGA = CBW8       \
+             CCM8       \
              CTC16      \
              CTC24      \
              CTC32      \
              UBW8       \
+             UCM8       \
              UTC16      \
              UTC24      \
              UTC32
@@ -43,18 +45,31 @@ FATE_TARGA = CBW8       \
 FATE_TARGA := $(FATE_TARGA:%=fate-targa-conformance-%)  \
               fate-targa-top-to-bottom
 
-FATE_TESTS += $(FATE_TARGA)
+FATE_IMAGE += $(FATE_TARGA)
 fate-targa: $(FATE_TARGA)
 
 fate-targa-conformance-CBW8:  CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA
-# fate-targa-conformance-CCM8:  CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA
-fate-targa-conformance-CTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC16.TGA
+fate-targa-conformance-CCM8:  CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA  -pix_fmt rgba
+fate-targa-conformance-CTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC16.TGA -pix_fmt rgb555le
 fate-targa-conformance-CTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC24.TGA
-fate-targa-conformance-CTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC32.TGA
+fate-targa-conformance-CTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC32.TGA -pix_fmt bgra
 fate-targa-conformance-UBW8:  CMD = framecrc -i $(SAMPLES)/targa-conformance/UBW8.TGA
-# fate-targa-conformance-UCM8:  CMD = framecrc -i $(SAMPLES)/targa-conformance/UCM8.TGA
-fate-targa-conformance-UTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC16.TGA
+fate-targa-conformance-UCM8:  CMD = framecrc -i $(SAMPLES)/targa-conformance/UCM8.TGA  -pix_fmt rgba
+fate-targa-conformance-UTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC16.TGA -pix_fmt rgb555le
 fate-targa-conformance-UTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC24.TGA
-fate-targa-conformance-UTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC32.TGA
+fate-targa-conformance-UTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra
 
 fate-targa-top-to-bottom: CMD = framecrc -i $(SAMPLES)/targa/lena-top-to-bottom.tga
+
+FATE_TIFF += fate-tiff-fax-g3
+fate-tiff-fax-g3: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31D.TIF
+
+FATE_TIFF += fate-tiff-fax-g3s
+fate-tiff-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF
+
+FATE_IMAGE += $(FATE_TIFF)
+fate-tiff: $(FATE_TIFF)
+
+FATE_TESTS += $(FATE_IMAGE)
+fate-image: $(FATE_IMAGE)
+