summaryrefslogtreecommitdiffstats
path: root/tests/fate
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2019-03-14 14:37:44 -0300
committerJames Almer <jamrial@gmail.com>2019-03-14 14:37:44 -0300
commita200bf8094bfaa0a0e4cf2fa270a18167a833d75 (patch)
tree269dc17bdd15df58dd6a325ceae291b31a45e4ad /tests/fate
parentfda424b300c1a0b991296aa585691609d01196bd (diff)
downloadffmpeg-streaming-a200bf8094bfaa0a0e4cf2fa270a18167a833d75.zip
ffmpeg-streaming-a200bf8094bfaa0a0e4cf2fa270a18167a833d75.tar.gz
tests: Convert lavf container tests with samples to non-legacy test scripts
Diffstat (limited to 'tests/fate')
-rw-r--r--tests/fate/avformat.mak13
-rw-r--r--tests/fate/lavf-container.mak22
2 files changed, 22 insertions, 13 deletions
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index e2f4d01..5dfd0fa 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -12,19 +12,6 @@ $(FATE_LAVF): CMP =
FATE_AVCONV += $(FATE_LAVF)
fate-lavf: $(FATE_LAVF)
-FATE_LAVF_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER) += ogg_vp3
-FATE_LAVF_FATE-$(call ALLYES, MATROSKA_DEMUXER OGV_MUXER) += ogg_vp8
-FATE_LAVF_FATE-$(call ALLYES, MOV_DEMUXER LATM_MUXER) += latm
-FATE_LAVF_FATE-$(call ALLYES, MP3_DEMUXER MP3_MUXER) += mp3
-FATE_LAVF_FATE-$(call ALLYES, MOV_DEMUXER MOV_MUXER) += mov_qtrle_mace6
-FATE_LAVF_FATE-$(call ALLYES, AVI_DEMUXER AVI_MUXER) += avi_cram
-
-FATE_LAVF_FATE += $(FATE_LAVF_FATE-yes:%=fate-lavf-fate-%)
-$(FATE_LAVF_FATE): CMD = lavffatetest
-
-FATE_SAMPLES_FFMPEG += $(FATE_LAVF_FATE)
-fate-lavf-fate: $(FATE_LAVF_FATE)
-
tests/data/mp4-to-ts.m3u8: TAG = GEN
tests/data/mp4-to-ts.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak
index 2f3fd03..a531914 100644
--- a/tests/fate/lavf-container.mak
+++ b/tests/fate/lavf-container.mak
@@ -55,3 +55,25 @@ fate-lavf-wtv: CMD = lavf_container "" "-c:a mp2 -threads 1"
FATE_AVCONV += $(FATE_LAVF_CONTAINER)
fate-lavf-container fate-lavf: $(FATE_LAVF_CONTAINER)
+
+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER) += vp3.ogg
+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGV_MUXER) += vp8.ogg
+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MOV_DEMUXER LATM_MUXER) += latm
+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MP3_DEMUXER MP3_MUXER) += mp3
+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MOV_DEMUXER MOV_MUXER) += qtrle_mace6.mov
+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, AVI_DEMUXER AVI_MUXER) += cram.avi
+
+FATE_LAVF_CONTAINER_FATE = $(FATE_LAVF_CONTAINER_FATE-yes:%=fate-lavf-fate-%)
+
+$(FATE_LAVF_CONTAINER_FATE): REF = $(SRC_PATH)/tests/ref/lavf-fate/$(@:fate-lavf-fate-%=%)
+$(FATE_LAVF_CONTAINER_FATE): $(AREF) $(VREF)
+
+fate-lavf-fate-vp3.ogg: CMD = lavf_container_fate "vp3/coeff_level64.mkv" "-idct auto"
+fate-lavf-fate-vp8.ogg: CMD = lavf_container_fate "vp8/RRSF49-short.webm" "" "-acodec copy"
+fate-lavf-fate-latm: CMD = lavf_container_fate "aac/al04_44.mp4" "" "-acodec copy"
+fate-lavf-fate-mp3: CMD = lavf_container_fate "mp3-conformance/he_32khz.bit" "" "-acodec copy"
+fate-lavf-fate-qtrle_mace6.mov: CMD = lavf_container_fate "qtrle/Animation-16Greys.mov" "-idct auto"
+fate-lavf-fate-cram.avi: CMD = lavf_container_fate "cram/toon.avi" "-idct auto"
+
+FATE_SAMPLES_FFMPEG += $(FATE_LAVF_CONTAINER_FATE)
+fate-lavf-fate fate-lavf: $(FATE_LAVF_CONTAINER_FATE)
OpenPOWER on IntegriCloud