Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 00:59:32 +0000 (01:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 00:59:32 +0000 (01:59 +0100)
* qatar/master:
  fate: add Alias PIX tests

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/image.mak
tests/ref/fate/aliaspix-bgr [new file with mode: 0644]
tests/ref/fate/aliaspix-gray [new file with mode: 0644]

index 7c2ac10..a971364 100644 (file)
@@ -1,3 +1,12 @@
+FATE_ALIASPIX += fate-aliaspix-bgr
+fate-aliaspix-bgr: CMD = framecrc -i $(TARGET_SAMPLES)/aliaspix/first.pix -pix_fmt bgr24
+
+FATE_ALIASPIX += fate-aliaspix-gray
+fate-aliaspix-gray: CMD = framecrc -i $(TARGET_SAMPLES)/aliaspix/firstgray.pix -pix_fmt gray
+
+FATE_ALIASPIX-$(call DEMDEC, IMAGE2, ALIAS_PIX) += $(FATE_ALIASPIX)
+FATE_IMAGE += $(FATE_ALIASPIX-yes)
+fate-aliaspix: $(FATE_ALIASPIX-yes)
 FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
 fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx
 
diff --git a/tests/ref/fate/aliaspix-bgr b/tests/ref/fate/aliaspix-bgr
new file mode 100644 (file)
index 0000000..235a5ac
--- /dev/null
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    36000, 0x9ff1ba55
diff --git a/tests/ref/fate/aliaspix-gray b/tests/ref/fate/aliaspix-gray
new file mode 100644 (file)
index 0000000..74cf6a2
--- /dev/null
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    12000, 0x29f8832c