summaryrefslogtreecommitdiffstats
path: root/tests/fate
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2019-02-02 13:54:47 +0100
committerDiego Biurrun <diego@biurrun.de>2019-02-16 18:15:30 +0100
commita957e9379d11f2982d615f92c30580a57ea8bb40 (patch)
treed3e972586cbc3eb6aefeae9a17d5ec3c19af6f31 /tests/fate
parenteb8a8115994434b548523cf0bca6a4a74784e79c (diff)
downloadffmpeg-streaming-a957e9379d11f2982d615f92c30580a57ea8bb40.zip
ffmpeg-streaming-a957e9379d11f2982d615f92c30580a57ea8bb40.tar.gz
tests: Convert lavf image tests to non-legacy test scripts
Rename some tests in the process for consistency and simplicity.
Diffstat (limited to 'tests/fate')
-rw-r--r--tests/fate/avformat.mak13
-rw-r--r--tests/fate/lavf-image.mak25
2 files changed, 25 insertions, 13 deletions
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index d840227..9dbdff7 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -1,31 +1,18 @@
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, 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
FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg
FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf
FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
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 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, 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 0000000..24acdb7
--- /dev/null
+++ b/tests/fate/lavf-image.mak
@@ -0,0 +1,25 @@
+FATE_LAVF_IMAGES-$(call ENCDEC, BMP, IMAGE2) += bmp
+FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += dpx
+FATE_LAVF_IMAGES-$(call ENCDEC, MJPEG, IMAGE2) += jpg
+FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += 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, 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, XWD, IMAGE2) += 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" "-f image2"
+fate-lavf-tiff: CMD = lavf_image "-pix_fmt rgb24"
+
+FATE_AVCONV += $(FATE_LAVF_IMAGES)
+fate-lavf-images fate-lavf: $(FATE_LAVF_IMAGES)
OpenPOWER on IntegriCloud