From b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 29 Mar 2016 20:04:08 +0200 Subject: fate: Update RSCC tests The current sample comes from an older version of the codec, which supports a single output mode, so rename it accordingly. Add tests for the new pixel formats. --- tests/fate/screen.mak | 16 ++++++++++++++-- tests/ref/fate/iscc | 6 ++++++ tests/ref/fate/rscc | 6 ------ tests/ref/fate/rscc-16bit | 16 ++++++++++++++++ tests/ref/fate/rscc-24bit | 2 ++ tests/ref/fate/rscc-32bit | 9 +++++++++ 6 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 tests/ref/fate/iscc delete mode 100644 tests/ref/fate/rscc create mode 100644 tests/ref/fate/rscc-16bit create mode 100644 tests/ref/fate/rscc-24bit create mode 100644 tests/ref/fate/rscc-32bit (limited to 'tests') diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index 82d4861a5c..7a87dd2094 100644 --- a/tests/fate/screen.mak +++ b/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 diff --git a/tests/ref/fate/iscc b/tests/ref/fate/iscc new file mode 100644 index 0000000000..69dbfe158e --- /dev/null +++ b/tests/ref/fate/iscc @@ -0,0 +1,6 @@ +#tb 0: 1/10 +0, 0, 0, 1, 6814720, 0x1365f8ef +0, 1, 1, 1, 6814720, 0x90838983 +0, 2, 2, 1, 6814720, 0xf0cc3131 +0, 3, 3, 1, 6814720, 0xc07e404d +0, 4, 4, 1, 6814720, 0x945962dd diff --git a/tests/ref/fate/rscc b/tests/ref/fate/rscc deleted file mode 100644 index 69dbfe158e..0000000000 --- a/tests/ref/fate/rscc +++ /dev/null @@ -1,6 +0,0 @@ -#tb 0: 1/10 -0, 0, 0, 1, 6814720, 0x1365f8ef -0, 1, 1, 1, 6814720, 0x90838983 -0, 2, 2, 1, 6814720, 0xf0cc3131 -0, 3, 3, 1, 6814720, 0xc07e404d -0, 4, 4, 1, 6814720, 0x945962dd diff --git a/tests/ref/fate/rscc-16bit b/tests/ref/fate/rscc-16bit new file mode 100644 index 0000000000..85d5494940 --- /dev/null +++ b/tests/ref/fate/rscc-16bit @@ -0,0 +1,16 @@ +#tb 0: 100/2397 +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 diff --git a/tests/ref/fate/rscc-24bit b/tests/ref/fate/rscc-24bit new file mode 100644 index 0000000000..e38702c733 --- /dev/null +++ b/tests/ref/fate/rscc-24bit @@ -0,0 +1,2 @@ +#tb 0: 100/2997 +0, 0, 0, 1, 1229760, 0x9c99ba99 diff --git a/tests/ref/fate/rscc-32bit b/tests/ref/fate/rscc-32bit new file mode 100644 index 0000000000..a4431865ab --- /dev/null +++ b/tests/ref/fate/rscc-32bit @@ -0,0 +1,9 @@ +#tb 0: 100/2397 +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 -- cgit v1.2.3