diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 23:33:38 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 23:41:40 +0100 |
| commit | e4c8e1906440cb45bb662f0894281238ca150ace (patch) | |
| tree | b1652ba2571845292477248f69b88c45e342c99b | |
| parent | dd2d26dc82b8f0fcbcad3104cbee03e7ec80b263 (diff) | |
| parent | b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914 (diff) | |
| download | ffmpeg-e4c8e1906440cb45bb662f0894281238ca150ace.tar.gz | |
Merge commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914'
* commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914':
fate: Update RSCC tests
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | tests/fate/screen.mak | 16 | ||||
| -rw-r--r-- | tests/ref/fate/iscc (renamed from tests/ref/fate/rscc) | 0 | ||||
| -rw-r--r-- | tests/ref/fate/rscc-16bit | 20 | ||||
| -rw-r--r-- | tests/ref/fate/rscc-24bit | 6 | ||||
| -rw-r--r-- | tests/ref/fate/rscc-32bit | 13 |
5 files changed, 53 insertions, 2 deletions
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index 635e5c40eb..8002ef642a 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/rscc b/tests/ref/fate/iscc index 7c1bb49939..7c1bb49939 100644 --- a/tests/ref/fate/rscc +++ b/tests/ref/fate/iscc diff --git a/tests/ref/fate/rscc-16bit b/tests/ref/fate/rscc-16bit new file mode 100644 index 0000000000..357196492b --- /dev/null +++ b/tests/ref/fate/rscc-16bit @@ -0,0 +1,20 @@ +#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 diff --git a/tests/ref/fate/rscc-24bit b/tests/ref/fate/rscc-24bit new file mode 100644 index 0000000000..c61ebd3224 --- /dev/null +++ b/tests/ref/fate/rscc-24bit @@ -0,0 +1,6 @@ +#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 diff --git a/tests/ref/fate/rscc-32bit b/tests/ref/fate/rscc-32bit new file mode 100644 index 0000000000..b55b4b9abf --- /dev/null +++ b/tests/ref/fate/rscc-32bit @@ -0,0 +1,13 @@ +#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 |