From 03b052c023e1f58d879cb7eeb6421ed39262d39d Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Mon, 15 Apr 2013 23:39:08 +0200
Subject: [PATCH] fate: Invoke standard lavfi tests through fate-run.sh
---
tests/fate-run.sh | 10 ++++++
tests/fate/avfilter.mak | 12 +------
tests/fate/filter-video.mak | 31 +++++++++++++++++++
tests/lavfi-regression.sh | 17 ----------
tests/ref/{lavfi/crop => fate/filter-crop} | 0
.../crop_scale => fate/filter-crop_scale} | 0
.../filter-crop_scale_vflip} | 0
.../crop_vflip => fate/filter-crop_vflip} | 0
tests/ref/{lavfi/null => fate/filter-null} | 0
.../{lavfi/scale200 => fate/filter-scale200} | 0
.../{lavfi/scale500 => fate/filter-scale500} | 0
tests/ref/{lavfi/vflip => fate/filter-vflip} | 0
.../vflip_crop => fate/filter-vflip_crop} | 0
.../vflip_vflip => fate/filter-vflip_vflip} | 0
14 files changed, 42 insertions(+), 28 deletions(-)
rename tests/ref/{lavfi/crop => fate/filter-crop} (100%)
rename tests/ref/{lavfi/crop_scale => fate/filter-crop_scale} (100%)
rename tests/ref/{lavfi/crop_scale_vflip => fate/filter-crop_scale_vflip} (100%)
rename tests/ref/{lavfi/crop_vflip => fate/filter-crop_vflip} (100%)
rename tests/ref/{lavfi/null => fate/filter-null} (100%)
rename tests/ref/{lavfi/scale200 => fate/filter-scale200} (100%)
rename tests/ref/{lavfi/scale500 => fate/filter-scale500} (100%)
rename tests/ref/{lavfi/vflip => fate/filter-vflip} (100%)
rename tests/ref/{lavfi/vflip_crop => fate/filter-vflip_crop} (100%)
rename tests/ref/{lavfi/vflip_vflip => fate/filter-vflip_vflip} (100%)
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 70821bbcec9..72554ad988e 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -161,6 +161,16 @@ lavfitest(){
regtest lavfi lavfi tests/vsynth1
}
+video_filter(){
+ filters=$1
+ shift
+ label=${test#filter-}
+ raw_src="${target_path}/tests/vsynth1/%02d.pgm"
+ printf '%-20s' $label
+ avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src \
+ $FLAGS $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5:
+}
+
mkdir -p "$outdir"
exec 3>&2
diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak
index de5e9d1b203..e31f449c163 100644
--- a/tests/fate/avfilter.mak
+++ b/tests/fate/avfilter.mak
@@ -1,9 +1,4 @@
-FATE_LAVFI = fate-lavfi-crop \
- fate-lavfi-crop_scale \
- fate-lavfi-crop_scale_vflip \
- fate-lavfi-crop_vflip \
- fate-lavfi-null \
- fate-lavfi-pixdesc \
+FATE_LAVFI = fate-lavfi-pixdesc \
fate-lavfi-pixfmts_copy \
fate-lavfi-pixfmts_crop \
fate-lavfi-pixfmts_hflip \
@@ -11,11 +6,6 @@ FATE_LAVFI = fate-lavfi-crop \
fate-lavfi-pixfmts_pad \
fate-lavfi-pixfmts_scale \
fate-lavfi-pixfmts_vflip \
- fate-lavfi-scale200 \
- fate-lavfi-scale500 \
- fate-lavfi-vflip \
- fate-lavfi-vflip_crop \
- fate-lavfi-vflip_vflip \
$(FATE_LAVFI): $(VREF) libavfilter/filtfmts-test$(EXESUF)
$(FATE_LAVFI): CMD = lavfitest
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index 420b41fbf60..736b99f2fb9 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@ -46,6 +46,37 @@ FATE_FILTER_VSYNTH-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp
fate-filter-unsharp: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf unsharp
+FATE_FILTER_VSYNTH-$(CONFIG_CROP_FILTER) += fate-filter-crop
+fate-filter-crop: CMD = video_filter "crop=iw-100:ih-100:100:100"
+
+FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER SCALE_FILTER) += fate-filter-crop_scale
+fate-filter-crop_scale: CMD = video_filter "crop=iw-100:ih-100:100:100,scale=400:-1"
+
+FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER SCALE_FILTER VFLIP_FILTER) += fate-filter-crop_scale_vflip
+fate-filter-crop_scale_vflip: CMD = video_filter "null,null,crop=iw-200:ih-200:200:200,crop=iw-20:ih-20:20:20,scale=200:200,scale=250:250,vflip,vflip,null,scale=200:200,crop=iw-100:ih-100:100:100,vflip,scale=200:200,null,vflip,crop=iw-100:ih-100:100:100,null"
+
+FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER VFLIP_FILTER) += fate-filter-crop_vflip
+fate-filter-crop_vflip: CMD = video_filter "crop=iw-100:ih-100:100:100,vflip"
+
+FATE_FILTER_VSYNTH-$(CONFIG_NULL_FILTER) += fate-filter-null
+fate-filter-null: CMD = video_filter "null"
+
+FATE_FILTER_VSYNTH-$(CONFIG_SCALE_FILTER) += fate-filter-scale200
+fate-filter-scale200: CMD = video_filter "scale=200:200"
+
+FATE_FILTER_VSYNTH-$(CONFIG_SCALE_FILTER) += fate-filter-scale500
+fate-filter-scale500: CMD = video_filter "scale=500:500"
+
+FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip
+fate-filter-vflip: CMD = video_filter "vflip"
+
+FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER VFLIP_FILTER) += fate-filter-vflip_crop
+fate-filter-vflip_crop: CMD = video_filter "vflip,crop=iw-100:ih-100:100:100"
+
+FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip_vflip
+fate-filter-vflip_vflip: CMD = video_filter "vflip,vflip"
+
+
$(FATE_FILTER_VSYNTH-yes): $(VREF)
$(FATE_FILTER_VSYNTH-yes): SRC = $(TARGET_PATH)/tests/vsynth1/%02d.pgm
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
index fc7c153f0fe..f2fc75212ce 100755
--- a/tests/lavfi-regression.sh
+++ b/tests/lavfi-regression.sh
@@ -20,23 +20,6 @@ do_video_filter() {
$ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5:
}
-do_lavfi() {
- if [ $test = $1 ] ; then
- do_video_filter $test "$2"
- fi
-}
-
-do_lavfi "crop" "crop=iw-100:ih-100:100:100"
-do_lavfi "crop_scale" "crop=iw-100:ih-100:100:100,scale=400:-1"
-do_lavfi "crop_scale_vflip" "null,null,crop=iw-200:ih-200:200:200,crop=iw-20:ih-20:20:20,scale=200:200,scale=250:250,vflip,vflip,null,scale=200:200,crop=iw-100:ih-100:100:100,vflip,scale=200:200,null,vflip,crop=iw-100:ih-100:100:100,null"
-do_lavfi "crop_vflip" "crop=iw-100:ih-100:100:100,vflip"
-do_lavfi "null" "null"
-do_lavfi "scale200" "scale=200:200"
-do_lavfi "scale500" "scale=500:500"
-do_lavfi "vflip" "vflip"
-do_lavfi "vflip_crop" "vflip,crop=iw-100:ih-100:100:100"
-do_lavfi "vflip_vflip" "vflip,vflip"
-
do_lavfi_pixfmts(){
test ${test%_[bl]e} = pixfmts_$1 || return 0
filter=$1
diff --git a/tests/ref/lavfi/crop b/tests/ref/fate/filter-crop
similarity index 100%
rename from tests/ref/lavfi/crop
rename to tests/ref/fate/filter-crop
diff --git a/tests/ref/lavfi/crop_scale b/tests/ref/fate/filter-crop_scale
similarity index 100%
rename from tests/ref/lavfi/crop_scale
rename to tests/ref/fate/filter-crop_scale
diff --git a/tests/ref/lavfi/crop_scale_vflip b/tests/ref/fate/filter-crop_scale_vflip
similarity index 100%
rename from tests/ref/lavfi/crop_scale_vflip
rename to tests/ref/fate/filter-crop_scale_vflip
diff --git a/tests/ref/lavfi/crop_vflip b/tests/ref/fate/filter-crop_vflip
similarity index 100%
rename from tests/ref/lavfi/crop_vflip
rename to tests/ref/fate/filter-crop_vflip
diff --git a/tests/ref/lavfi/null b/tests/ref/fate/filter-null
similarity index 100%
rename from tests/ref/lavfi/null
rename to tests/ref/fate/filter-null
diff --git a/tests/ref/lavfi/scale200 b/tests/ref/fate/filter-scale200
similarity index 100%
rename from tests/ref/lavfi/scale200
rename to tests/ref/fate/filter-scale200
diff --git a/tests/ref/lavfi/scale500 b/tests/ref/fate/filter-scale500
similarity index 100%
rename from tests/ref/lavfi/scale500
rename to tests/ref/fate/filter-scale500
diff --git a/tests/ref/lavfi/vflip b/tests/ref/fate/filter-vflip
similarity index 100%
rename from tests/ref/lavfi/vflip
rename to tests/ref/fate/filter-vflip
diff --git a/tests/ref/lavfi/vflip_crop b/tests/ref/fate/filter-vflip_crop
similarity index 100%
rename from tests/ref/lavfi/vflip_crop
rename to tests/ref/fate/filter-vflip_crop
diff --git a/tests/ref/lavfi/vflip_vflip b/tests/ref/fate/filter-vflip_vflip
similarity index 100%
rename from tests/ref/lavfi/vflip_vflip
rename to tests/ref/fate/filter-vflip_vflip
--
GitLab