diff options
| author | James Almer <jamrial@gmail.com> | 2019-03-14 14:24:19 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-03-14 14:30:08 -0300 |
| commit | c2631dfd0a0a12050cc1765fd41702c5e93abee5 (patch) | |
| tree | 68755106bd63e8778238f3b7efb8f6d6cdb46f44 /tests | |
| parent | 29929fc8e2449d2db8bd144b2badc8d1e6347412 (diff) | |
| parent | a957e9379d11f2982d615f92c30580a57ea8bb40 (diff) | |
Merge commit 'a957e9379d11f2982d615f92c30580a57ea8bb40'
* commit 'a957e9379d11f2982d615f92c30580a57ea8bb40':
tests: Convert lavf image tests to non-legacy test scripts
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests')
39 files changed, 175 insertions, 201 deletions
diff --git a/tests/Makefile b/tests/Makefile index 122ab3d821..628d4bb8fe 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -91,6 +91,7 @@ include $(SRC_PATH)/tests/fate/vcodec.mak include $(SRC_PATH)/tests/fate/avformat.mak include $(SRC_PATH)/tests/fate/lavf-audio.mak +include $(SRC_PATH)/tests/fate/lavf-image.mak include $(SRC_PATH)/tests/fate/lavf-image2pipe.mak include $(SRC_PATH)/tests/fate/seek.mak diff --git a/tests/fate-run.sh b/tests/fate-run.sh index e65184ba36..a141488b33 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -290,6 +290,17 @@ lavf_audio(){ do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file } +lavf_image(){ + t="${test#lavf-}" + outdir="tests/data/images/$t" + mkdir -p "$outdir" + file=${outdir}/%02d.$t + run_avconv $DEC_OPTS $1 -f image2 -c:v pgmyuv -i $raw_src "$ENC_OPTS -metadata title=lavftest" $2 -frames 13 -y -qscale 10 $target_path/$file + do_md5sum ${outdir}/02.$t + do_avconv_crc $file $DEC_OPTS $2 -i $target_path/$file + echo $(wc -c ${outdir}/02.$t) +} + lavf_image2pipe(){ t="${test#lavf-}" t="${t%pipe}" diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak index 31d828d0e4..461f9e01cb 100644 --- a/tests/fate/avformat.mak +++ b/tests/fate/avformat.mak @@ -1,15 +1,12 @@ FATE_LAVF-$(call ENCDEC, APNG, APNG) += apng FATE_LAVF-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, AVI) += avi -FATE_LAVF-$(call ENCDEC, BMP, IMAGE2) += bmp -FATE_LAVF-$(call ENCDEC, DPX, IMAGE2) += dpx FATE_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv_fmt FATE_LAVF-$(call ENCDEC, FITS, FITS) += fits FATE_LAVF-$(call ENCDEC, RAWVIDEO, FILMSTRIP) += flm FATE_LAVF-$(call ENCDEC, FLV, FLV) += flv_fmt FATE_LAVF-$(call ENCDEC, GIF, IMAGE2) += gif FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf -FATE_LAVF-$(call ENCDEC, MJPEG, IMAGE2) += jpg FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv FATE_LAVF-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov ismv FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg @@ -20,22 +17,11 @@ FATE_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dvcp FATE_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom FATE_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut -FATE_LAVF-$(call ENCDEC, PAM, IMAGE2) += pam -FATE_LAVF-$(call ENCDEC, PCX, IMAGE2) += pcx -FATE_LAVF-$(call ENCDEC, PGM, IMAGE2) += pgm -FATE_LAVF-$(call ENCDEC, PNG, IMAGE2) += png -FATE_LAVF-$(call ENCDEC, PPM, IMAGE2) += ppm FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm -FATE_LAVF-$(call ENCDEC, SGI, IMAGE2) += sgi FATE_LAVF-$(call ENCMUX, MJPEG PCM_S16LE, SMJPEG) += smjpeg -FATE_LAVF-$(call ENCDEC, SUNRAST, IMAGE2) += sunrast FATE_LAVF-$(call ENCDEC, FLV, SWF) += swf -FATE_LAVF-$(call ENCDEC, TARGA, IMAGE2) += tga -FATE_LAVF-$(call ENCDEC, TIFF, IMAGE2) += tiff FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts FATE_LAVF-$(call ENCDEC, MP2, WTV) += wtv -FATE_LAVF-$(call ENCDEC, XBM, IMAGE2) += xbm -FATE_LAVF-$(call ENCDEC, XWD, IMAGE2) += xwd FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%) diff --git a/tests/fate/lavf-image.mak b/tests/fate/lavf-image.mak new file mode 100644 index 0000000000..f22d187d90 --- /dev/null +++ b/tests/fate/lavf-image.mak @@ -0,0 +1,64 @@ +FATE_LAVF_IMAGES-$(call ENCDEC, BMP, IMAGE2) += bmp +FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += dpx +FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += gbrp10le.dpx +FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += gbrp12le.dpx +FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += rgb48le.dpx +FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += rgb48le_10.dpx +FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += rgba64le.dpx +FATE_LAVF_IMAGES-$(call ENCDEC, MJPEG, IMAGE2) += jpg +FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += pam +FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += rgba.pam +FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += gray.pam +FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += gray16be.pam +FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += rgb48be.pam +FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += monob.pam +FATE_LAVF_IMAGES-$(call ENCDEC, PCX, IMAGE2) += pcx +FATE_LAVF_IMAGES-$(call ENCDEC, PGM, IMAGE2) += pgm +FATE_LAVF_IMAGES-$(call ENCDEC, PNG, IMAGE2) += png +FATE_LAVF_IMAGES-$(call ENCDEC, PNG, IMAGE2) += gray16be.png +FATE_LAVF_IMAGES-$(call ENCDEC, PNG, IMAGE2) += rgb48be.png +FATE_LAVF_IMAGES-$(call ENCDEC, PPM, IMAGE2) += ppm +FATE_LAVF_IMAGES-$(call ENCDEC, SGI, IMAGE2) += sgi +FATE_LAVF_IMAGES-$(call ENCDEC, SUNRAST, IMAGE2) += sun +FATE_LAVF_IMAGES-$(call ENCDEC, TARGA, IMAGE2) += tga +FATE_LAVF_IMAGES-$(call ENCDEC, TIFF, IMAGE2) += tiff +FATE_LAVF_IMAGES-$(call ENCDEC, XBM, IMAGE2) += xbm +FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += xwd +FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgba.xwd +FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgb565be.xwd +FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgb555be.xwd +FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgb8.xwd +FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += rgb4_byte.xwd +FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += gray.xwd +FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += monow.xwd + +FATE_LAVF_IMAGES = $(FATE_LAVF_IMAGES-yes:%=fate-lavf-%) + +$(FATE_LAVF_IMAGES): CMD = lavf_image +$(FATE_LAVF_IMAGES): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%) +$(FATE_LAVF_IMAGES): $(VREF) + +fate-lavf-jpg: CMD = lavf_image "" "-pix_fmt yuvj420p" +fate-lavf-tiff: CMD = lavf_image "" "-pix_fmt rgb24" +fate-lavf-gbrp10le.dpx: CMD = lavf_image "" "-pix_fmt gbrp10le" +fate-lavf-gbrp12le.dpx: CMD = lavf_image "" "-pix_fmt gbrp12le" +fate-lavf-rgb48le.dpx: CMD = lavf_image "" "-pix_fmt rgb48le" +fate-lavf-rgb48le_10.dpx: CMD = lavf_image "-pix_fmt rgb48le -bits_per_raw_sample 10" "-pix_fmt rgb48le" +fate-lavf-rgba64le.dpx: CMD = lavf_image "" "-pix_fmt rgba64le" +fate-lavf-rgba.pam: CMD = lavf_image "" "-pix_fmt rgba" +fate-lavf-gray.pam: CMD = lavf_image "" "-pix_fmt gray" +fate-lavf-gray16be.pam: CMD = lavf_image "" "-pix_fmt gray16be" +fate-lavf-rgb48be.pam: CMD = lavf_image "" "-pix_fmt rgb48be" +fate-lavf-monob.pam: CMD = lavf_image "" "-pix_fmt monob" +fate-lavf-gray16be.png: CMD = lavf_image "" "-pix_fmt gray16be" +fate-lavf-rgb48be.png: CMD = lavf_image "" "-pix_fmt rgb48be" +fate-lavf-rgba.xwd: CMD = lavf_image "" "-pix_fmt rgba" +fate-lavf-rgb565be.xwd: CMD = lavf_image "" "-pix_fmt rgb565be" +fate-lavf-rgb555be.xwd: CMD = lavf_image "" "-pix_fmt rgb555be" +fate-lavf-rgb8.xwd: CMD = lavf_image "" "-pix_fmt rgb8" +fate-lavf-rgb4_byte.xwd: CMD = lavf_image "" "-pix_fmt rgb4_byte" +fate-lavf-gray.xwd: CMD = lavf_image "" "-pix_fmt gray" +fate-lavf-monow.xwd: CMD = lavf_image "" "-pix_fmt monow" + +FATE_AVCONV += $(FATE_LAVF_IMAGES) +fate-lavf-images fate-lavf: $(FATE_LAVF_IMAGES) diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index f516290722..f3f6dc4e85 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -39,17 +39,6 @@ do_lavf_timecode() do_lavf $1 "" "$2" } -do_image_formats() -{ - outfile="$datadir/images/$1/" - mkdir -p "$outfile" - file=${outfile}%02d.$1 - run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $2 $ENC_OPTS -frames 13 -y -qscale 10 $target_path/$file - do_md5sum ${outfile}02.$1 - do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3 - echo $(wc -c ${outfile}02.$1) -} - if [ -n "$do_avi" ] ; then do_lavf avi "" "-acodec mp2 -ar 44100 -ab 64k -threads 1" fi @@ -217,83 +206,6 @@ for pix_fmt in $pix_fmts ; do done fi -# image formats - -if [ -n "$do_pgm" ] ; then -do_image_formats pgm -fi - -if [ -n "$do_ppm" ] ; then -do_image_formats ppm -fi - -if [ -n "$do_png" ] ; then -do_image_formats png -do_image_formats png "-pix_fmt gray16be" -do_image_formats png "-pix_fmt rgb48be" -fi - -if [ -n "$do_xbm" ] ; then -do_image_formats xbm -fi - -if [ -n "$do_bmp" ] ; then -do_image_formats bmp -fi - -if [ -n "$do_tga" ] ; then -do_image_formats tga -fi - -if [ -n "$do_tiff" ] ; then -do_image_formats tiff "-pix_fmt rgb24" -fi - -if [ -n "$do_sgi" ] ; then -do_image_formats sgi -fi - -if [ -n "$do_jpg" ] ; then -do_image_formats jpg "-pix_fmt yuvj420p" -fi - -if [ -n "$do_pam" ] ; then -do_image_formats pam -do_image_formats pam "-pix_fmt rgba" -do_image_formats pam "-pix_fmt gray" -do_image_formats pam "-pix_fmt gray16be" "-pix_fmt gray16be" -do_image_formats pam "-pix_fmt rgb48be" "-pix_fmt rgb48be" -do_image_formats pam "-pix_fmt monob" -fi - -if [ -n "$do_pcx" ] ; then -do_image_formats pcx -fi - -if [ -n "$do_dpx" ] ; then -do_image_formats dpx -do_image_formats dpx "-pix_fmt gbrp10le" "-pix_fmt gbrp10le" -do_image_formats dpx "-pix_fmt gbrp12le" "-pix_fmt gbrp12le" -do_image_formats dpx "-pix_fmt rgb48le" -do_image_formats dpx "-pix_fmt rgb48le -bits_per_raw_sample 10" "-pix_fmt rgb48le" -do_image_formats dpx "-pix_fmt rgba64le" -fi - -if [ -n "$do_xwd" ] ; then -do_image_formats xwd -do_image_formats xwd "-pix_fmt rgba" -do_image_formats xwd "-pix_fmt rgb565be" -do_image_formats xwd "-pix_fmt rgb555be" -do_image_formats xwd "-pix_fmt rgb8" -do_image_formats xwd "-pix_fmt rgb4_byte" -do_image_formats xwd "-pix_fmt gray" -do_image_formats xwd "-pix_fmt monow" -fi - -if [ -n "$do_sunrast" ] ; then -do_image_formats sun -fi - if [ -n "$do_smjpeg" ] ; then do_lavf smjpeg "" "-f smjpeg" fi diff --git a/tests/ref/lavf/bmp b/tests/ref/lavf/bmp index 8958855eee..af767e552a 100644 --- a/tests/ref/lavf/bmp +++ b/tests/ref/lavf/bmp @@ -1,3 +1,3 @@ -71f4d64a6b3c71f43a4eff526f84841c *./tests/data/images/bmp/02.bmp -./tests/data/images/bmp/%02d.bmp CRC=0xe6c71946 -304182 ./tests/data/images/bmp/02.bmp +71f4d64a6b3c71f43a4eff526f84841c *tests/data/images/bmp/02.bmp +tests/data/images/bmp/%02d.bmp CRC=0xe6c71946 +304182 tests/data/images/bmp/02.bmp diff --git a/tests/ref/lavf/dpx b/tests/ref/lavf/dpx index 7bbed3e8c0..68fe25afcd 100644 --- a/tests/ref/lavf/dpx +++ b/tests/ref/lavf/dpx @@ -1,18 +1,3 @@ -4c8880d5835ffb5fe37c1ed8c8d404de *./tests/data/images/dpx/02.dpx -./tests/data/images/dpx/%02d.dpx CRC=0x6da01946 -305792 ./tests/data/images/dpx/02.dpx -7ca935d5d5e00c54acbc85565d3039b6 *./tests/data/images/dpx/02.dpx -./tests/data/images/dpx/%02d.dpx CRC=0xe6663fba -407168 ./tests/data/images/dpx/02.dpx -a4cfea1797c928f2eff73573e559675d *./tests/data/images/dpx/02.dpx -./tests/data/images/dpx/%02d.dpx CRC=0x1c755633 -609920 ./tests/data/images/dpx/02.dpx -075963c3c08978b6a20555ba09161434 *./tests/data/images/dpx/02.dpx -./tests/data/images/dpx/%02d.dpx CRC=0xe5b9c023 -609920 ./tests/data/images/dpx/02.dpx -b9f22728f8ff393bf30cf6cbd624fa95 *./tests/data/images/dpx/02.dpx -./tests/data/images/dpx/%02d.dpx CRC=0xf38d5830 -407168 ./tests/data/images/dpx/02.dpx -545603630f30dec2768c8ae8d12eb8ea *./tests/data/images/dpx/02.dpx -./tests/data/images/dpx/%02d.dpx CRC=0xe72ce131 -812672 ./tests/data/images/dpx/02.dpx +4c8880d5835ffb5fe37c1ed8c8d404de *tests/data/images/dpx/02.dpx +tests/data/images/dpx/%02d.dpx CRC=0x6da01946 +305792 tests/data/images/dpx/02.dpx diff --git a/tests/ref/lavf/gbrp10le.dpx b/tests/ref/lavf/gbrp10le.dpx new file mode 100644 index 0000000000..b33da34e20 --- /dev/null +++ b/tests/ref/lavf/gbrp10le.dpx @@ -0,0 +1,3 @@ +7ca935d5d5e00c54acbc85565d3039b6 *tests/data/images/gbrp10le.dpx/02.gbrp10le.dpx +tests/data/images/gbrp10le.dpx/%02d.gbrp10le.dpx CRC=0xe6663fba +407168 tests/data/images/gbrp10le.dpx/02.gbrp10le.dpx diff --git a/tests/ref/lavf/gbrp12le.dpx b/tests/ref/lavf/gbrp12le.dpx new file mode 100644 index 0000000000..e2e794ecc6 --- /dev/null +++ b/tests/ref/lavf/gbrp12le.dpx @@ -0,0 +1,3 @@ +a4cfea1797c928f2eff73573e559675d *tests/data/images/gbrp12le.dpx/02.gbrp12le.dpx +tests/data/images/gbrp12le.dpx/%02d.gbrp12le.dpx CRC=0x1c755633 +609920 tests/data/images/gbrp12le.dpx/02.gbrp12le.dpx diff --git a/tests/ref/lavf/gray.pam b/tests/ref/lavf/gray.pam new file mode 100644 index 0000000000..77af981c42 --- /dev/null +++ b/tests/ref/lavf/gray.pam @@ -0,0 +1,3 @@ +35cb9e42b2d3181be494f8693af1ddea *tests/data/images/gray.pam/02.gray.pam +tests/data/images/gray.pam/%02d.gray.pam CRC=0x0ff205be +101445 tests/data/images/gray.pam/02.gray.pam diff --git a/tests/ref/lavf/gray.xwd b/tests/ref/lavf/gray.xwd new file mode 100644 index 0000000000..15c80fba34 --- /dev/null +++ b/tests/ref/lavf/gray.xwd @@ -0,0 +1,3 @@ +85e9b8b814a1dea71d143aac2e487037 *tests/data/images/gray.xwd/02.gray.xwd +tests/data/images/gray.xwd/%02d.gray.xwd CRC=0x0ff205be +101487 tests/data/images/gray.xwd/02.gray.xwd diff --git a/tests/ref/lavf/gray16be.pam b/tests/ref/lavf/gray16be.pam new file mode 100644 index 0000000000..3907d840a1 --- /dev/null +++ b/tests/ref/lavf/gray16be.pam @@ -0,0 +1,3 @@ +740eb42157af9e9eed46b70ba6a6cf4d *tests/data/images/gray16be.pam/02.gray16be.pam +tests/data/images/gray16be.pam/%02d.gray16be.pam CRC=0x879b10ef +202823 tests/data/images/gray16be.pam/02.gray16be.pam diff --git a/tests/ref/lavf/gray16be.png b/tests/ref/lavf/gray16be.png new file mode 100644 index 0000000000..2f52a8336d --- /dev/null +++ b/tests/ref/lavf/gray16be.png @@ -0,0 +1,3 @@ +6cf54c13aa407b77547cf6dfe23ecba3 *tests/data/images/gray16be.png/02.gray16be.png +tests/data/images/gray16be.png/%02d.gray16be.png CRC=0x893f10ef +47365 tests/data/images/gray16be.png/02.gray16be.png diff --git a/tests/ref/lavf/jpg b/tests/ref/lavf/jpg index 508066747f..ecbb22ceba 100644 --- a/tests/ref/lavf/jpg +++ b/tests/ref/lavf/jpg @@ -1,3 +1,3 @@ -1e7c6d937f21c045e0b238a83f62f3c5 *./tests/data/images/jpg/02.jpg -./tests/data/images/jpg/%02d.jpg CRC=0xe3509f33 -26037 ./tests/data/images/jpg/02.jpg +1e7c6d937f21c045e0b238a83f62f3c5 *tests/data/images/jpg/02.jpg +tests/data/images/jpg/%02d.jpg CRC=0xe3509f33 +26037 tests/data/images/jpg/02.jpg diff --git a/tests/ref/lavf/monob.pam b/tests/ref/lavf/monob.pam new file mode 100644 index 0000000000..488907e11f --- /dev/null +++ b/tests/ref/lavf/monob.pam @@ -0,0 +1,3 @@ +d2f5eb2f959ca3a90c02f1887b6e0c4f *tests/data/images/monob.pam/02.monob.pam +tests/data/images/monob.pam/%02d.monob.pam CRC=0xab19200d +101447 tests/data/images/monob.pam/02.monob.pam diff --git a/tests/ref/lavf/monow.xwd b/tests/ref/lavf/monow.xwd new file mode 100644 index 0000000000..da09d8b191 --- /dev/null +++ b/tests/ref/lavf/monow.xwd @@ -0,0 +1,3 @@ +796e2e309ac0844cfb2f4959816508ee *tests/data/images/monow.xwd/02.monow.xwd +tests/data/images/monow.xwd/%02d.monow.xwd CRC=0xc9a20204 +12783 tests/data/images/monow.xwd/02.monow.xwd diff --git a/tests/ref/lavf/pam b/tests/ref/lavf/pam index 97893f60c7..8ac3f2b10e 100644 --- a/tests/ref/lavf/pam +++ b/tests/ref/lavf/pam @@ -1,18 +1,3 @@ -0dce5565222cf0f8b309467f279aecd2 *./tests/data/images/pam/02.pam -./tests/data/images/pam/%02d.pam CRC=0x6da01946 -304191 ./tests/data/images/pam/02.pam -2ed31ca8d8de560afb3e0fd7a873cde5 *./tests/data/images/pam/02.pam -./tests/data/images/pam/%02d.pam CRC=0xf07d29cd -405573 ./tests/data/images/pam/02.pam -35cb9e42b2d3181be494f8693af1ddea *./tests/data/images/pam/02.pam -./tests/data/images/pam/%02d.pam CRC=0x0ff205be -101445 ./tests/data/images/pam/02.pam -740eb42157af9e9eed46b70ba6a6cf4d *./tests/data/images/pam/02.pam -./tests/data/images/pam/%02d.pam CRC=0x893f10ef -202823 ./tests/data/images/pam/02.pam -032538f0313b4f240b44a5bef115f5bf *./tests/data/images/pam/02.pam -./tests/data/images/pam/%02d.pam CRC=0x5984c023 -608321 ./tests/data/images/pam/02.pam -d2f5eb2f959ca3a90c02f1887b6e0c4f *./tests/data/images/pam/02.pam -./tests/data/images/pam/%02d.pam CRC=0xab19200d -101447 ./tests/data/images/pam/02.pam +0dce5565222cf0f8b309467f279aecd2 *tests/data/images/pam/02.pam +tests/data/images/pam/%02d.pam CRC=0x6da01946 +304191 tests/data/images/pam/02.pam diff --git a/tests/ref/lavf/pcx b/tests/ref/lavf/pcx index 6568b6028c..2767ccf32e 100644 --- a/tests/ref/lavf/pcx +++ b/tests/ref/lavf/pcx @@ -1,3 +1,3 @@ -c4faf65ecc812ec8412cc26140c13bd5 *./tests/data/images/pcx/02.pcx -./tests/data/images/pcx/%02d.pcx CRC=0x6da01946 -364147 ./tests/data/images/pcx/02.pcx +c4faf65ecc812ec8412cc26140c13bd5 *tests/data/images/pcx/02.pcx +tests/data/images/pcx/%02d.pcx CRC=0x6da01946 +364147 tests/data/images/pcx/02.pcx diff --git a/tests/ref/lavf/pgm b/tests/ref/lavf/pgm index 816579fa86..4100ac95cd 100644 --- a/tests/ref/lavf/pgm +++ b/tests/ref/lavf/pgm @@ -1,3 +1,3 @@ -cc777c5fc4d116d4c5a996eac8d3133e *./tests/data/images/pgm/02.pgm -./tests/data/images/pgm/%02d.pgm CRC=0x0ff205be -101391 ./tests/data/images/pgm/02.pgm +cc777c5fc4d116d4c5a996eac8d3133e *tests/data/images/pgm/02.pgm +tests/data/images/pgm/%02d.pgm CRC=0x0ff205be +101391 tests/data/images/pgm/02.pgm diff --git a/tests/ref/lavf/png b/tests/ref/lavf/png index 9cf677b21b..165513e98a 100644 --- a/tests/ref/lavf/png +++ b/tests/ref/lavf/png @@ -1,9 +1,3 @@ -2af72da4468e61a37c220b25cb28618a *./tests/data/images/png/02.png -./tests/data/images/png/%02d.png CRC=0x6da01946 -248633 ./tests/data/images/png/02.png -6cf54c13aa407b77547cf6dfe23ecba3 *./tests/data/images/png/02.png -./tests/data/images/png/%02d.png CRC=0x893f10ef -47365 ./tests/data/images/png/02.png -b4e38244c97debe3f528e7d1adb283ef *./tests/data/images/png/02.png -./tests/data/images/png/%02d.png CRC=0x5984c023 -511900 ./tests/data/images/png/02.png +2af72da4468e61a37c220b25cb28618a *tests/data/images/png/02.png +tests/data/images/png/%02d.png CRC=0x6da01946 +248633 tests/data/images/png/02.png diff --git a/tests/ref/lavf/ppm b/tests/ref/lavf/ppm index 97093aaac5..04377f12d3 100644 --- a/tests/ref/lavf/ppm +++ b/tests/ref/lavf/ppm @@ -1,3 +1,3 @@ -16d5dadf0b362fc8ba3cb676c5dde985 *./tests/data/images/ppm/02.ppm -./tests/data/images/ppm/%02d.ppm CRC=0x6da01946 -304143 ./tests/data/images/ppm/02.ppm +16d5dadf0b362fc8ba3cb676c5dde985 *tests/data/images/ppm/02.ppm +tests/data/images/ppm/%02d.ppm CRC=0x6da01946 +304143 tests/data/images/ppm/02.ppm diff --git a/tests/ref/lavf/rgb48be.pam b/tests/ref/lavf/rgb48be.pam new file mode 100644 index 0000000000..bb3edbe8ea --- /dev/null +++ b/tests/ref/lavf/rgb48be.pam @@ -0,0 +1,3 @@ +032538f0313b4f240b44a5bef115f5bf *tests/data/images/rgb48be.pam/02.rgb48be.pam +tests/data/images/rgb48be.pam/%02d.rgb48be.pam CRC=0xe5b9c023 +608321 tests/data/images/rgb48be.pam/02.rgb48be.pam diff --git a/tests/ref/lavf/rgb48be.png b/tests/ref/lavf/rgb48be.png new file mode 100644 index 0000000000..84f4d46f5c --- /dev/null +++ b/tests/ref/lavf/rgb48be.png @@ -0,0 +1,3 @@ +b4e38244c97debe3f528e7d1adb283ef *tests/data/images/rgb48be.png/02.rgb48be.png +tests/data/images/rgb48be.png/%02d.rgb48be.png CRC=0x5984c023 +511900 tests/data/images/rgb48be.png/02.rgb48be.png diff --git a/tests/ref/lavf/rgb48le.dpx b/tests/ref/lavf/rgb48le.dpx new file mode 100644 index 0000000000..073153898a --- /dev/null +++ b/tests/ref/lavf/rgb48le.dpx @@ -0,0 +1,3 @@ +075963c3c08978b6a20555ba09161434 *tests/data/images/rgb48le.dpx/02.rgb48le.dpx +tests/data/images/rgb48le.dpx/%02d.rgb48le.dpx CRC=0xe5b9c023 +609920 tests/data/images/rgb48le.dpx/02.rgb48le.dpx diff --git a/tests/ref/lavf/rgb48le_10.dpx b/tests/ref/lavf/rgb48le_10.dpx new file mode 100644 index 0000000000..9947eeb524 --- /dev/null +++ b/tests/ref/lavf/rgb48le_10.dpx @@ -0,0 +1,3 @@ +b9f22728f8ff393bf30cf6cbd624fa95 *tests/data/images/rgb48le_10.dpx/02.rgb48le_10.dpx +tests/data/images/rgb48le_10.dpx/%02d.rgb48le_10.dpx CRC=0xa150e4c9 +407168 tests/data/images/rgb48le_10.dpx/02.rgb48le_10.dpx diff --git a/tests/ref/lavf/rgb4_byte.xwd b/tests/ref/lavf/rgb4_byte.xwd new file mode 100644 index 0000000000..fee4cf7289 --- /dev/null +++ b/tests/ref/lavf/rgb4_byte.xwd @@ -0,0 +1,3 @@ +fe1af954966a40c2cd35fc27094ff823 *tests/data/images/rgb4_byte.xwd/02.rgb4_byte.xwd +tests/data/images/rgb4_byte.xwd/%02d.rgb4_byte.xwd CRC=0xce042dcc +104559 tests/data/images/rgb4_byte.xwd/02.rgb4_byte.xwd diff --git a/tests/ref/lavf/rgb555be.xwd b/tests/ref/lavf/rgb555be.xwd new file mode 100644 index 0000000000..1f9c579bc4 --- /dev/null +++ b/tests/ref/lavf/rgb555be.xwd @@ -0,0 +1,3 @@ +1300938325d5ac12caa09a43bd58f37c *tests/data/images/rgb555be.xwd/02.rgb555be.xwd +tests/data/images/rgb555be.xwd/%02d.rgb555be.xwd CRC=0x14555d6e +202863 tests/data/images/rgb555be.xwd/02.rgb555be.xwd diff --git a/tests/ref/lavf/rgb565be.xwd b/tests/ref/lavf/rgb565be.xwd new file mode 100644 index 0000000000..02a5bc28d3 --- /dev/null +++ b/tests/ref/lavf/rgb565be.xwd @@ -0,0 +1,3 @@ +c0866e9e710fce735423594a93bee604 *tests/data/images/rgb565be.xwd/02.rgb565be.xwd +tests/data/images/rgb565be.xwd/%02d.rgb565be.xwd CRC=0x53209216 +202863 tests/data/images/rgb565be.xwd/02.rgb565be.xwd diff --git a/tests/ref/lavf/rgb8.xwd b/tests/ref/lavf/rgb8.xwd new file mode 100644 index 0000000000..52f4e3eeba --- /dev/null +++ b/tests/ref/lavf/rgb8.xwd @@ -0,0 +1,3 @@ +c6f3cb7c45f7238474a89d2ad61a1caf *tests/data/images/rgb8.xwd/02.rgb8.xwd +tests/data/images/rgb8.xwd/%02d.rgb8.xwd CRC=0xf217a95e +104559 tests/data/images/rgb8.xwd/02.rgb8.xwd diff --git a/tests/ref/lavf/rgba.pam b/tests/ref/lavf/rgba.pam new file mode 100644 index 0000000000..56e43a4ace --- /dev/null +++ b/tests/ref/lavf/rgba.pam @@ -0,0 +1,3 @@ +2ed31ca8d8de560afb3e0fd7a873cde5 *tests/data/images/rgba.pam/02.rgba.pam +tests/data/images/rgba.pam/%02d.rgba.pam CRC=0xf07d29cd +405573 tests/data/images/rgba.pam/02.rgba.pam diff --git a/tests/ref/lavf/rgba.xwd b/tests/ref/lavf/rgba.xwd new file mode 100644 index 0000000000..95aafdceb8 --- /dev/null +++ b/tests/ref/lavf/rgba.xwd @@ -0,0 +1,3 @@ +1cdb43599c956dc8563f1e09fac5df00 *tests/data/images/rgba.xwd/02.rgba.xwd +tests/data/images/rgba.xwd/%02d.rgba.xwd CRC=0xf07d29cd +405615 tests/data/images/rgba.xwd/02.rgba.xwd diff --git a/tests/ref/lavf/rgba64le.dpx b/tests/ref/lavf/rgba64le.dpx new file mode 100644 index 0000000000..b4092c9fd8 --- /dev/null +++ b/tests/ref/lavf/rgba64le.dpx @@ -0,0 +1,3 @@ +545603630f30dec2768c8ae8d12eb8ea *tests/data/images/rgba64le.dpx/02.rgba64le.dpx +tests/data/images/rgba64le.dpx/%02d.rgba64le.dpx CRC=0xe72ce131 +812672 tests/data/images/rgba64le.dpx/02.rgba64le.dpx diff --git a/tests/ref/lavf/sgi b/tests/ref/lavf/sgi index 6f45802d86..5049278069 100644 --- a/tests/ref/lavf/sgi +++ b/tests/ref/lavf/sgi @@ -1,3 +1,3 @@ -d446e540a7c18da5fd3cc0e9942cd46f *./tests/data/images/sgi/02.sgi -./tests/data/images/sgi/%02d.sgi CRC=0x6da01946 -307287 ./tests/data/images/sgi/02.sgi +d446e540a7c18da5fd3cc0e9942cd46f *tests/data/images/sgi/02.sgi +tests/data/images/sgi/%02d.sgi CRC=0x6da01946 +307287 tests/data/images/sgi/02.sgi diff --git a/tests/ref/lavf/sun b/tests/ref/lavf/sun new file mode 100644 index 0000000000..5dc0011e7e --- /dev/null +++ b/tests/ref/lavf/sun @@ -0,0 +1,3 @@ +07518bcb0841bc677ce6aea8464ea240 *tests/data/images/sun/02.sun +tests/data/images/sun/%02d.sun CRC=0xe6c71946 +304123 tests/data/images/sun/02.sun diff --git a/tests/ref/lavf/sunrast b/tests/ref/lavf/sunrast deleted file mode 100644 index 4db0505140..0000000000 --- a/tests/ref/lavf/sunrast +++ /dev/null @@ -1,3 +0,0 @@ -07518bcb0841bc677ce6aea8464ea240 *./tests/data/images/sun/02.sun -./tests/data/images/sun/%02d.sun CRC=0xe6c71946 -304123 ./tests/data/images/sun/02.sun diff --git a/tests/ref/lavf/tga b/tests/ref/lavf/tga index 7efaf97828..c7e33b0437 100644 --- a/tests/ref/lavf/tga +++ b/tests/ref/lavf/tga @@ -1,3 +1,3 @@ -c0305c53e6d79d4ed9f35f04f671246c *./tests/data/images/tga/02.tga -./tests/data/images/tga/%02d.tga CRC=0xe6c71946 -304172 ./tests/data/images/tga/02.tga +c0305c53e6d79d4ed9f35f04f671246c *tests/data/images/tga/02.tga +tests/data/images/tga/%02d.tga CRC=0xe6c71946 +304172 tests/data/images/tga/02.tga diff --git a/tests/ref/lavf/tiff b/tests/ref/lavf/tiff index 4b0b985f76..c708642f94 100644 --- a/tests/ref/lavf/tiff +++ b/tests/ref/lavf/tiff @@ -1,3 +1,3 @@ -b3299346a8959553a437e486d8f3bf76 *./tests/data/images/tiff/02.tiff -./tests/data/images/tiff/%02d.tiff CRC=0x6da01946 -307131 ./tests/data/images/tiff/02.tiff +b3299346a8959553a437e486d8f3bf76 *tests/data/images/tiff/02.tiff +tests/data/images/tiff/%02d.tiff CRC=0x6da01946 +307131 tests/data/images/tiff/02.tiff diff --git a/tests/ref/lavf/xbm b/tests/ref/lavf/xbm index 705713b22b..bc157834ff 100644 --- a/tests/ref/lavf/xbm +++ b/tests/ref/lavf/xbm @@ -1,3 +1,3 @@ -0629055fd82366317c651a0af4bb82d7 *./tests/data/images/xbm/02.xbm -./tests/data/images/xbm/%02d.xbm CRC=0xc9a20204 -76411 ./tests/data/images/xbm/02.xbm +0629055fd82366317c651a0af4bb82d7 *tests/data/images/xbm/02.xbm +tests/data/images/xbm/%02d.xbm CRC=0xc9a20204 +76411 tests/data/images/xbm/02.xbm diff --git a/tests/ref/lavf/xwd b/tests/ref/lavf/xwd index b263ce6991..7a426ed1f7 100644 --- a/tests/ref/lavf/xwd +++ b/tests/ref/lavf/xwd @@ -1,24 +1,3 @@ -50baa5560b7d1aa3188b19c1162bf7dc *./tests/data/images/xwd/02.xwd -./tests/data/images/xwd/%02d.xwd CRC=0x6da01946 -304239 ./tests/data/images/xwd/02.xwd -1cdb43599c956dc8563f1e09fac5df00 *./tests/data/images/xwd/02.xwd -./tests/data/images/xwd/%02d.xwd CRC=0xf07d29cd -405615 ./tests/data/images/xwd/02.xwd -c0866e9e710fce735423594a93bee604 *./tests/data/images/xwd/02.xwd -./tests/data/images/xwd/%02d.xwd CRC=0x53209216 -202863 ./tests/data/images/xwd/02.xwd -1300938325d5ac12caa09a43bd58f37c *./tests/data/images/xwd/02.xwd -./tests/data/images/xwd/%02d.xwd CRC=0x14555d6e -202863 ./tests/data/images/xwd/02.xwd -c6f3cb7c45f7238474a89d2ad61a1caf *./tests/data/images/xwd/02.xwd -./tests/data/images/xwd/%02d.xwd CRC=0xf217a95e -104559 ./tests/data/images/xwd/02.xwd -fe1af954966a40c2cd35fc27094ff823 *./tests/data/images/xwd/02.xwd -./tests/data/images/xwd/%02d.xwd CRC=0xce042dcc -104559 ./tests/data/images/xwd/02.xwd -85e9b8b814a1dea71d143aac2e487037 *./tests/data/images/xwd/02.xwd -./tests/data/images/xwd/%02d.xwd CRC=0x0ff205be -101487 ./tests/data/images/xwd/02.xwd -796e2e309ac0844cfb2f4959816508ee *./tests/data/images/xwd/02.xwd -./tests/data/images/xwd/%02d.xwd CRC=0xc9a20204 -12783 ./tests/data/images/xwd/02.xwd +50baa5560b7d1aa3188b19c1162bf7dc *tests/data/images/xwd/02.xwd +tests/data/images/xwd/%02d.xwd CRC=0x6da01946 +304239 tests/data/images/xwd/02.xwd |
