diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 23:44:19 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 23:46:58 +0100 |
| commit | 486776d06f6e0ee9d2bc0c56471260291ba56737 (patch) | |
| tree | 95e613d6ef9377962bece4256682cbcce0ffb22d | |
| parent | 483e9d8a2bb46ffaff8c41af7a7be01ebd7458df (diff) | |
| parent | 8dde92b95a197eb809d798aacb34dbe52a0689a8 (diff) | |
| download | ffmpeg-486776d06f6e0ee9d2bc0c56471260291ba56737.tar.gz | |
Merge commit '8dde92b95a197eb809d798aacb34dbe52a0689a8'
* commit '8dde92b95a197eb809d798aacb34dbe52a0689a8':
fate: Update Screenpresso tests
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | tests/fate/screen.mak | 13 | ||||
| -rw-r--r-- | tests/ref/fate/screenpresso-16bit | 13 | ||||
| -rw-r--r-- | tests/ref/fate/screenpresso-24bit (renamed from tests/ref/fate/screenpresso) | 0 | ||||
| -rw-r--r-- | tests/ref/fate/screenpresso-32bit | 9 |
4 files changed, 33 insertions, 2 deletions
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index 8002ef642a..deb84652a2 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -56,8 +56,17 @@ 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 +FATE_SCREENPRESSO += fate-screenpresso-16bit +fate-screenpresso-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/spv1/16bpp_555.avi -an + +FATE_SCREENPRESSO += fate-screenpresso-24bit +fate-screenpresso-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/spv1/bunny.avi -an + +FATE_SCREENPRESSO += fate-screenpresso-32bit +fate-screenpresso-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/spv1/32bpp.avi -an + +FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, SCREENPRESSO) += $(FATE_SCREENPRESSO) +fate-screenpresso: $(FATE_SCREENPRESSO) FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, TDSC) += fate-tdsc fate-tdsc: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/tdsc/tdsc.asf -an -pix_fmt bgr24 diff --git a/tests/ref/fate/screenpresso-16bit b/tests/ref/fate/screenpresso-16bit new file mode 100644 index 0000000000..88c33a662d --- /dev/null +++ b/tests/ref/fate/screenpresso-16bit @@ -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, 153600, 0x69a234de +0, 1, 1, 1, 153600, 0x7f43aee5 +0, 2, 2, 1, 153600, 0x81030634 +0, 3, 3, 1, 153600, 0xf570d0ef +0, 4, 4, 1, 153600, 0x386e8cec +0, 5, 5, 1, 153600, 0xbe53af8f +0, 6, 6, 1, 153600, 0xf92f48bd +0, 7, 7, 1, 153600, 0x594472c5 diff --git a/tests/ref/fate/screenpresso b/tests/ref/fate/screenpresso-24bit index 74195d487d..74195d487d 100644 --- a/tests/ref/fate/screenpresso +++ b/tests/ref/fate/screenpresso-24bit diff --git a/tests/ref/fate/screenpresso-32bit b/tests/ref/fate/screenpresso-32bit new file mode 100644 index 0000000000..fc06ec228e --- /dev/null +++ b/tests/ref/fate/screenpresso-32bit @@ -0,0 +1,9 @@ +#tb 0: 100/2397 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 0/1 +0, 0, 0, 1, 307200, 0xa01f27cc +0, 1, 1, 1, 307200, 0x5d83c4d0 +0, 2, 2, 1, 307200, 0xb7d7919f +0, 3, 3, 1, 307200, 0x4d201450 |