aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-09 14:48:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-09 15:05:44 +0100
commit2b318f8ca91674aea75a0ab8c7e8a7ceae1a2ff1 (patch)
treebab4ff6c135ec88d5560bcd849f8b538bdeecf04
parent3773738e26c9480a9ebdada54016dd2687c66774 (diff)
parenta246af86e47044dec243db2f708cc125d608ea78 (diff)
downloadffmpeg-2b318f8ca91674aea75a0ab8c7e8a7ceae1a2ff1.tar.gz
Merge commit 'a246af86e47044dec243db2f708cc125d608ea78'
* commit 'a246af86e47044dec243db2f708cc125d608ea78': FATE: add MSS2 tests Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--tests/fate/microsoft.mak18
-rw-r--r--tests/ref/fate/mss2-pal3
-rw-r--r--tests/ref/fate/mss2-pals3
-rw-r--r--tests/ref/fate/mss2-rgb5553
-rw-r--r--tests/ref/fate/mss2-rgb555s3
-rw-r--r--tests/ref/fate/mss2-wmv101
6 files changed, 131 insertions, 0 deletions
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak
index 630dda8719..0afb282591 100644
--- a/tests/fate/microsoft.mak
+++ b/tests/fate/microsoft.mak
@@ -1,6 +1,24 @@
FATE_MICROSOFT-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1
fate-msmpeg4v1: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/msmpeg4v1/mpg4.avi -an
+FATE_MSS2 += fate-mss2-pal
+fate-mss2-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rlepal.wmv
+
+FATE_MSS2 += fate-mss2-pals
+fate-mss2-pals: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rlepals.wmv
+
+FATE_MSS2 += fate-mss2-rgb555
+fate-mss2-rgb555: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rle555.wmv
+
+FATE_MSS2 += fate-mss2-rgb555s
+fate-mss2-rgb555s: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rle555s.wmv
+
+FATE_MSS2 += fate-mss2-wmv
+fate-mss2-wmv: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/msscreencodec.wmv -an -frames 100
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS2) += $(FATE_MSS2)
+fate-mss2: $(FATE_MSS2)
+
FATE_MSVIDEO1 += fate-msvideo1-8bit
fate-msvideo1-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24
diff --git a/tests/ref/fate/mss2-pal b/tests/ref/fate/mss2-pal
new file mode 100644
index 0000000000..ae8bd6fc39
--- /dev/null
+++ b/tests/ref/fate/mss2-pal
@@ -0,0 +1,3 @@
+#tb 0: 1/1000
+0, 0, 0, 0, 9216, 0xd3c106ef
+0, 100, 100, 0, 9216, 0x8871f7c2
diff --git a/tests/ref/fate/mss2-pals b/tests/ref/fate/mss2-pals
new file mode 100644
index 0000000000..ae8bd6fc39
--- /dev/null
+++ b/tests/ref/fate/mss2-pals
@@ -0,0 +1,3 @@
+#tb 0: 1/1000
+0, 0, 0, 0, 9216, 0xd3c106ef
+0, 100, 100, 0, 9216, 0x8871f7c2
diff --git a/tests/ref/fate/mss2-rgb555 b/tests/ref/fate/mss2-rgb555
new file mode 100644
index 0000000000..d15b3b4e6d
--- /dev/null
+++ b/tests/ref/fate/mss2-rgb555
@@ -0,0 +1,3 @@
+#tb 0: 1/1000
+0, 0, 0, 0, 6144, 0x4145b7ae
+0, 100, 100, 0, 6144, 0x3b2b38de
diff --git a/tests/ref/fate/mss2-rgb555s b/tests/ref/fate/mss2-rgb555s
new file mode 100644
index 0000000000..d15b3b4e6d
--- /dev/null
+++ b/tests/ref/fate/mss2-rgb555s
@@ -0,0 +1,3 @@
+#tb 0: 1/1000
+0, 0, 0, 0, 6144, 0x4145b7ae
+0, 100, 100, 0, 6144, 0x3b2b38de
diff --git a/tests/ref/fate/mss2-wmv b/tests/ref/fate/mss2-wmv
new file mode 100644
index 0000000000..8ca58509a7
--- /dev/null
+++ b/tests/ref/fate/mss2-wmv
@@ -0,0 +1,101 @@
+#tb 0: 1/15
+0, 0, 0, 1, 230400, 0x00000000
+0, 3, 3, 1, 230400, 0xaf950008
+0, 4, 4, 1, 230400, 0x8d2a0010
+0, 5, 5, 1, 230400, 0xd75e0018
+0, 6, 6, 1, 230400, 0x00000000
+0, 7, 7, 1, 230400, 0x517f0008
+0, 8, 8, 1, 230400, 0xcf5a0010
+0, 9, 9, 1, 230400, 0x00000000
+0, 10, 10, 1, 230400, 0x40ef0018
+0, 11, 11, 1, 230400, 0xdc850008
+0, 12, 12, 1, 230400, 0x00000000
+0, 13, 13, 1, 230400, 0x09a40008
+0, 14, 14, 1, 230400, 0x00000000
+0, 15, 15, 1, 230400, 0x8b950008
+0, 16, 16, 1, 230400, 0xae260038
+0, 17, 17, 1, 230400, 0x6d850008
+0, 18, 18, 1, 230400, 0x00000000
+0, 23, 23, 1, 230400, 0x8b950008
+0, 24, 24, 1, 230400, 0x75450018
+0, 25, 25, 1, 230400, 0xb0dd0010
+0, 26, 26, 1, 230400, 0xecdd0018
+0, 27, 27, 1, 230400, 0x68e3f7f7
+0, 28, 28, 1, 230400, 0x9cfdcea6
+0, 29, 29, 1, 230400, 0x735ababf
+0, 30, 30, 1, 230400, 0xa1c604ea
+0, 31, 31, 1, 230400, 0x18a2f97a
+0, 32, 32, 1, 230400, 0xf9e82961
+0, 33, 33, 1, 230400, 0x57a8e9e8
+0, 34, 34, 1, 230400, 0xdef6fd66
+0, 35, 35, 1, 230400, 0xc7d923a9
+0, 36, 36, 1, 230400, 0x08bb41ee
+0, 37, 37, 1, 230400, 0x43ccbd29
+0, 38, 38, 1, 230400, 0x46666ee3
+0, 39, 39, 1, 230400, 0xbfd2ef29
+0, 40, 40, 1, 230400, 0x6504545f
+0, 41, 41, 1, 230400, 0x8fb86901
+0, 42, 42, 1, 230400, 0xc95f0917
+0, 43, 43, 1, 230400, 0x21f6a54b
+0, 44, 44, 1, 230400, 0xf808106b
+0, 45, 45, 1, 230400, 0x34150020
+0, 46, 46, 1, 230400, 0x50fdfe89
+0, 47, 47, 1, 230400, 0x920b7708
+0, 48, 48, 1, 230400, 0xed64fcc4
+0, 49, 49, 1, 230400, 0x6291a170
+0, 50, 50, 1, 230400, 0x20524643
+0, 51, 51, 1, 230400, 0x92aafecd
+0, 52, 52, 1, 230400, 0xf00ee14d
+0, 53, 53, 1, 230400, 0xfa3113ea
+0, 54, 54, 1, 230400, 0x99c06df1
+0, 55, 55, 1, 230400, 0x625c6918
+0, 56, 56, 1, 230400, 0xb277b25e
+0, 57, 57, 1, 230400, 0x2e913006
+0, 58, 58, 1, 230400, 0x3f6f1d99
+0, 59, 59, 1, 230400, 0x100ab60f
+0, 60, 60, 1, 230400, 0x9b73d0bf
+0, 61, 61, 1, 230400, 0xda0df2ce
+0, 62, 62, 1, 230400, 0x67f7ca24
+0, 63, 63, 1, 230400, 0xbde9b3d0
+0, 64, 64, 1, 230400, 0x92e14d07
+0, 65, 65, 1, 230400, 0x9426c3d9
+0, 66, 66, 1, 230400, 0x6104be70
+0, 67, 67, 1, 230400, 0xc4d1078a
+0, 68, 68, 1, 230400, 0x89426a42
+0, 69, 69, 1, 230400, 0x5271324a
+0, 70, 70, 1, 230400, 0x1cb1c735
+0, 71, 71, 1, 230400, 0x4249b8c6
+0, 72, 72, 1, 230400, 0x4b88cad3
+0, 73, 73, 1, 230400, 0x76af545d
+0, 74, 74, 1, 230400, 0xfe47e3c4
+0, 75, 75, 1, 230400, 0xa2e0e721
+0, 76, 76, 1, 230400, 0xde974a42
+0, 77, 77, 1, 230400, 0xe86a376b
+0, 78, 78, 1, 230400, 0xd52318fd
+0, 79, 79, 1, 230400, 0x0bbb1526
+0, 80, 80, 1, 230400, 0xa22c5e5e
+0, 81, 81, 1, 230400, 0x4532c5d2
+0, 82, 82, 1, 230400, 0x88b560ec
+0, 83, 83, 1, 230400, 0xcee9d9c9
+0, 84, 84, 1, 230400, 0x0429358f
+0, 85, 85, 1, 230400, 0xf18a9b98
+0, 86, 86, 1, 230400, 0x63f7a12c
+0, 87, 87, 1, 230400, 0x98635515
+0, 88, 88, 1, 230400, 0x36affebc
+0, 89, 89, 1, 230400, 0xd8c19629
+0, 90, 90, 1, 230400, 0x9ef5344d
+0, 91, 91, 1, 230400, 0x545668dc
+0, 92, 92, 1, 230400, 0x50e65e74
+0, 93, 93, 1, 230400, 0xe3258be3
+0, 94, 94, 1, 230400, 0xeb479e1b
+0, 95, 95, 1, 230400, 0x91894243
+0, 96, 96, 1, 230400, 0x3c5660fc
+0, 97, 97, 1, 230400, 0xf0c35673
+0, 98, 98, 1, 230400, 0x552832e8
+0, 99, 99, 1, 230400, 0x1970f2b1
+0, 100, 100, 1, 230400, 0x812d4c91
+0, 101, 101, 1, 230400, 0xa3fbd4ef
+0, 102, 102, 1, 230400, 0x486f9649
+0, 103, 103, 1, 230400, 0x850f315a
+0, 104, 104, 1, 230400, 0xc18ec66b
+0, 105, 105, 1, 230400, 0xc9ef266e