ffmpeg | branch: master | Derek Buitenhuis <derek.buitenh...@gmail.com> | Sun May 8 23:44:19 2016 +0100| [486776d06f6e0ee9d2bc0c56471260291ba56737] | committer: Derek Buitenhuis
Merge commit '8dde92b95a197eb809d798aacb34dbe52a0689a8' * commit '8dde92b95a197eb809d798aacb34dbe52a0689a8': fate: Update Screenpresso tests Merged-by: Derek Buitenhuis <derek.buitenh...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=486776d06f6e0ee9d2bc0c56471260291ba56737 --- tests/fate/screen.mak | 13 +++++++++++-- tests/ref/fate/screenpresso-16bit | 13 +++++++++++++ tests/ref/fate/{screenpresso => screenpresso-24bit} | 0 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 8002ef6..deb8465 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 0000000..88c33a6 --- /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 similarity index 100% rename from tests/ref/fate/screenpresso rename to tests/ref/fate/screenpresso-24bit diff --git a/tests/ref/fate/screenpresso-32bit b/tests/ref/fate/screenpresso-32bit new file mode 100644 index 0000000..fc06ec2 --- /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 ====================================================================== diff --cc tests/ref/fate/screenpresso-16bit index 0000000,d9a7d89..88c33a6 mode 000000,100644..100644 --- a/tests/ref/fate/screenpresso-16bit +++ b/tests/ref/fate/screenpresso-16bit @@@ -1,0 -1,9 +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 --cc tests/ref/fate/screenpresso-32bit index 0000000,5e1a3b5..fc06ec2 mode 000000,100644..100644 --- a/tests/ref/fate/screenpresso-32bit +++ b/tests/ref/fate/screenpresso-32bit @@@ -1,0 -1,5 +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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
