From 03b052c023e1f58d879cb7eeb6421ed39262d39d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 15 Apr 2013 23:39:08 +0200 Subject: 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/fate/filter-crop | 1 + tests/ref/fate/filter-crop_scale | 1 + tests/ref/fate/filter-crop_scale_vflip | 1 + tests/ref/fate/filter-crop_vflip | 1 + tests/ref/fate/filter-null | 1 + tests/ref/fate/filter-scale200 | 1 + tests/ref/fate/filter-scale500 | 1 + tests/ref/fate/filter-vflip | 1 + tests/ref/fate/filter-vflip_crop | 1 + tests/ref/fate/filter-vflip_vflip | 1 + tests/ref/lavfi/crop | 1 - tests/ref/lavfi/crop_scale | 1 - tests/ref/lavfi/crop_scale_vflip | 1 - tests/ref/lavfi/crop_vflip | 1 - tests/ref/lavfi/null | 1 - tests/ref/lavfi/scale200 | 1 - tests/ref/lavfi/scale500 | 1 - tests/ref/lavfi/vflip | 1 - tests/ref/lavfi/vflip_crop | 1 - tests/ref/lavfi/vflip_vflip | 1 - 24 files changed, 52 insertions(+), 38 deletions(-) create mode 100644 tests/ref/fate/filter-crop create mode 100644 tests/ref/fate/filter-crop_scale create mode 100644 tests/ref/fate/filter-crop_scale_vflip create mode 100644 tests/ref/fate/filter-crop_vflip create mode 100644 tests/ref/fate/filter-null create mode 100644 tests/ref/fate/filter-scale200 create mode 100644 tests/ref/fate/filter-scale500 create mode 100644 tests/ref/fate/filter-vflip create mode 100644 tests/ref/fate/filter-vflip_crop create mode 100644 tests/ref/fate/filter-vflip_vflip delete mode 100644 tests/ref/lavfi/crop delete mode 100644 tests/ref/lavfi/crop_scale delete mode 100644 tests/ref/lavfi/crop_scale_vflip delete mode 100644 tests/ref/lavfi/crop_vflip delete mode 100644 tests/ref/lavfi/null delete mode 100644 tests/ref/lavfi/scale200 delete mode 100644 tests/ref/lavfi/scale500 delete mode 100644 tests/ref/lavfi/vflip delete mode 100644 tests/ref/lavfi/vflip_crop delete mode 100644 tests/ref/lavfi/vflip_vflip (limited to 'tests') diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 70821bbcec..72554ad988 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 de5e9d1b20..e31f449c16 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 420b41fbf6..736b99f2fb 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 fc7c153f0f..f2fc75212c 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/fate/filter-crop b/tests/ref/fate/filter-crop new file mode 100644 index 0000000000..32041c2184 --- /dev/null +++ b/tests/ref/fate/filter-crop @@ -0,0 +1 @@ +crop 3d163f156eaddf41d2be20736f973539 diff --git a/tests/ref/fate/filter-crop_scale b/tests/ref/fate/filter-crop_scale new file mode 100644 index 0000000000..82e5394496 --- /dev/null +++ b/tests/ref/fate/filter-crop_scale @@ -0,0 +1 @@ +crop_scale 0a3d45d58b805b8c47416b9239535f94 diff --git a/tests/ref/fate/filter-crop_scale_vflip b/tests/ref/fate/filter-crop_scale_vflip new file mode 100644 index 0000000000..29574f769f --- /dev/null +++ b/tests/ref/fate/filter-crop_scale_vflip @@ -0,0 +1 @@ +crop_scale_vflip 3e2c7694d37733ca52e1723d5262af36 diff --git a/tests/ref/fate/filter-crop_vflip b/tests/ref/fate/filter-crop_vflip new file mode 100644 index 0000000000..a3f8200222 --- /dev/null +++ b/tests/ref/fate/filter-crop_vflip @@ -0,0 +1 @@ +crop_vflip 628542e17b6900ee79b1429183ae01b0 diff --git a/tests/ref/fate/filter-null b/tests/ref/fate/filter-null new file mode 100644 index 0000000000..3c3b7b742d --- /dev/null +++ b/tests/ref/fate/filter-null @@ -0,0 +1 @@ +null eba2f135a08829387e2f698ff72a2939 diff --git a/tests/ref/fate/filter-scale200 b/tests/ref/fate/filter-scale200 new file mode 100644 index 0000000000..17103a256d --- /dev/null +++ b/tests/ref/fate/filter-scale200 @@ -0,0 +1 @@ +scale200 aebdc1c3e08da2a925ba7212b1fadee0 diff --git a/tests/ref/fate/filter-scale500 b/tests/ref/fate/filter-scale500 new file mode 100644 index 0000000000..93ba4f2485 --- /dev/null +++ b/tests/ref/fate/filter-scale500 @@ -0,0 +1 @@ +scale500 ef865c51156e55ce1ce38c8f90a709e6 diff --git a/tests/ref/fate/filter-vflip b/tests/ref/fate/filter-vflip new file mode 100644 index 0000000000..66b873270a --- /dev/null +++ b/tests/ref/fate/filter-vflip @@ -0,0 +1 @@ +vflip 2e6d6062e8cad37fb3ab2c433b55f382 diff --git a/tests/ref/fate/filter-vflip_crop b/tests/ref/fate/filter-vflip_crop new file mode 100644 index 0000000000..6bb832f4cc --- /dev/null +++ b/tests/ref/fate/filter-vflip_crop @@ -0,0 +1 @@ +vflip_crop 72ee0d0dfc8af0cd94a466760313654d diff --git a/tests/ref/fate/filter-vflip_vflip b/tests/ref/fate/filter-vflip_vflip new file mode 100644 index 0000000000..b719745dc6 --- /dev/null +++ b/tests/ref/fate/filter-vflip_vflip @@ -0,0 +1 @@ +vflip_vflip eba2f135a08829387e2f698ff72a2939 diff --git a/tests/ref/lavfi/crop b/tests/ref/lavfi/crop deleted file mode 100644 index 32041c2184..0000000000 --- a/tests/ref/lavfi/crop +++ /dev/null @@ -1 +0,0 @@ -crop 3d163f156eaddf41d2be20736f973539 diff --git a/tests/ref/lavfi/crop_scale b/tests/ref/lavfi/crop_scale deleted file mode 100644 index 82e5394496..0000000000 --- a/tests/ref/lavfi/crop_scale +++ /dev/null @@ -1 +0,0 @@ -crop_scale 0a3d45d58b805b8c47416b9239535f94 diff --git a/tests/ref/lavfi/crop_scale_vflip b/tests/ref/lavfi/crop_scale_vflip deleted file mode 100644 index 29574f769f..0000000000 --- a/tests/ref/lavfi/crop_scale_vflip +++ /dev/null @@ -1 +0,0 @@ -crop_scale_vflip 3e2c7694d37733ca52e1723d5262af36 diff --git a/tests/ref/lavfi/crop_vflip b/tests/ref/lavfi/crop_vflip deleted file mode 100644 index a3f8200222..0000000000 --- a/tests/ref/lavfi/crop_vflip +++ /dev/null @@ -1 +0,0 @@ -crop_vflip 628542e17b6900ee79b1429183ae01b0 diff --git a/tests/ref/lavfi/null b/tests/ref/lavfi/null deleted file mode 100644 index 3c3b7b742d..0000000000 --- a/tests/ref/lavfi/null +++ /dev/null @@ -1 +0,0 @@ -null eba2f135a08829387e2f698ff72a2939 diff --git a/tests/ref/lavfi/scale200 b/tests/ref/lavfi/scale200 deleted file mode 100644 index 17103a256d..0000000000 --- a/tests/ref/lavfi/scale200 +++ /dev/null @@ -1 +0,0 @@ -scale200 aebdc1c3e08da2a925ba7212b1fadee0 diff --git a/tests/ref/lavfi/scale500 b/tests/ref/lavfi/scale500 deleted file mode 100644 index 93ba4f2485..0000000000 --- a/tests/ref/lavfi/scale500 +++ /dev/null @@ -1 +0,0 @@ -scale500 ef865c51156e55ce1ce38c8f90a709e6 diff --git a/tests/ref/lavfi/vflip b/tests/ref/lavfi/vflip deleted file mode 100644 index 66b873270a..0000000000 --- a/tests/ref/lavfi/vflip +++ /dev/null @@ -1 +0,0 @@ -vflip 2e6d6062e8cad37fb3ab2c433b55f382 diff --git a/tests/ref/lavfi/vflip_crop b/tests/ref/lavfi/vflip_crop deleted file mode 100644 index 6bb832f4cc..0000000000 --- a/tests/ref/lavfi/vflip_crop +++ /dev/null @@ -1 +0,0 @@ -vflip_crop 72ee0d0dfc8af0cd94a466760313654d diff --git a/tests/ref/lavfi/vflip_vflip b/tests/ref/lavfi/vflip_vflip deleted file mode 100644 index b719745dc6..0000000000 --- a/tests/ref/lavfi/vflip_vflip +++ /dev/null @@ -1 +0,0 @@ -vflip_vflip eba2f135a08829387e2f698ff72a2939 -- cgit v1.2.3