Merge commit 'b5f47d95'

* commit 'b5f47d95':
  fate: Update RSCC tests
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

tests/fate/screen.mak

@@ -41,8 +41,20 @@ fate-g2m4: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/g2m/g2m4.asf
 FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, G2M) += $(FATE_G2M)
 fate-g2m: $(FATE_G2M)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, RSCC) += fate-rscc
-fate-rscc: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/pip.avi -an
+FATE_RSCC += fate-iscc
+fate-iscc: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/pip.avi -an
+
+FATE_RSCC += fate-rscc-16bit
+fate-rscc-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/16bpp_555.avi -an
+
+FATE_RSCC += fate-rscc-24bit
+fate-rscc-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/24bpp.avi -an
+
+FATE_RSCC += fate-rscc-32bit
+fate-rscc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/32bpp.avi -an
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, RSCC) += $(FATE_RSCC)
+fate-rscc: $(FATE_RSCC)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, SCREENPRESSO) += fate-screenpresso
 fate-screenpresso: CMD = framecrc -i $(TARGET_SAMPLES)/spv1/bunny.avi

tests/ref/fate/rscc-16bit

+#tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+0,          0,          0,        1,   153600, 0x33759daf
+0,          1,          1,        1,   153600, 0x43e0c910
+0,          2,          2,        1,   153600, 0x6c75a8f0
+0,          3,          3,        1,   153600, 0xaace1255
+0,          4,          4,        1,   153600, 0x42d3f439
+0,          5,          5,        1,   153600, 0xb225b396
+0,          6,          6,        1,   153600, 0xa615221c
+0,          7,          7,        1,   153600, 0x5401f5a9
+0,          8,          8,        1,   153600, 0xd274cef3
+0,          9,          9,        1,   153600, 0x7935f992
+0,         10,         10,        1,   153600, 0x7669e7c6
+0,         11,         11,        1,   153600, 0x527bd6a1
+0,         12,         12,        1,   153600, 0x0f33b2ed
+0,         13,         13,        1,   153600, 0xe62ddb32
+0,         14,         14,        1,   153600, 0x81541aa2

tests/ref/fate/rscc-24bit

+#tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 854x480
+#sar 0: 0/1
+0,          0,          0,        1,  1229760, 0x9c99ba99

tests/ref/fate/rscc-32bit

+#tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+0,          0,          0,        1,   307200, 0xe36c2c38
+0,          1,          1,        1,   307200, 0xa2e3476b
+0,          2,          2,        1,   307200, 0x65167c95
+0,          3,          3,        1,   307200, 0x6acd02ac
+0,          4,          4,        1,   307200, 0x37935e0b
+0,          5,          5,        1,   307200, 0x8e6918bc
+0,          6,          6,        1,   307200, 0x0a246578
+0,          7,          7,        1,   307200, 0x9c1a2f4c