diff options
| -rwxr-xr-x | tests/fate-run.sh | 3 | ||||
| -rw-r--r-- | tests/fate/avfilter.mak | 3 | ||||
| -rw-r--r-- | tests/fate/filter-video.mak | 3 | ||||
| -rwxr-xr-x | tests/lavfi-regression.sh | 1 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-kerndeint (renamed from tests/ref/lavfi/kerndeint) | 0 |
5 files changed, 6 insertions, 4 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index afb1984314..ea3fe72bd7 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -187,6 +187,7 @@ pixdesc(){ pixfmts(){ filter=${test#filter-pixfmts-} filter_args=$1 + prefilter_chain=$2 showfiltfmts="$target_exec $target_path/libavfilter/filtfmts-test" scale_exclude_fmts=${outfile}${1}_scale_exclude_fmts @@ -204,7 +205,7 @@ pixfmts(){ for pix_fmt in $pix_fmts; do test=$pix_fmt - video_filter "format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt + video_filter "${prefilter_chain}format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt done rm $in_fmts $scale_in_fmts $scale_out_fmts $scale_exclude_fmts diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak index 3bfe78a995..c8cf78c677 100644 --- a/tests/fate/avfilter.mak +++ b/tests/fate/avfilter.mak @@ -1,7 +1,6 @@ #FIXME the whole file should be removed -FATE_LAVFI-$(CONFIG_GPL) += fate-lavfi-kerndeint \ - fate-lavfi-tinterlace_merge \ +FATE_LAVFI-$(CONFIG_GPL) += fate-lavfi-tinterlace_merge \ fate-lavfi-tinterlace_pad \ FATE_LAVFI += $(FATE_LAVFI-yes) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index fb5008edb2..41e0ac9197 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -192,6 +192,9 @@ fate-filter-pixfmts-hflip: CMD = pixfmts FATE_FILTER_PIXFMTS-$(CONFIG_IL_FILTER) += fate-filter-pixfmts-il fate-filter-pixfmts-il: CMD = pixfmts "luma_mode=d:chroma_mode=d:alpha_mode=d" +FATE_FILTER_PIXFMTS-$(CONFIG_KERNDEINT_FILTER) += fate-filter-pixfmts-kerndeint +fate-filter-pixfmts-kerndeint: CMD = pixfmts "" "tinterlace=interleave_top," + FATE_FILTER_PIXFMTS-$(CONFIG_NULL_FILTER) += fate-filter-pixfmts-null fate-filter-pixfmts-null: CMD = pixfmts diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index 506d1dc1dc..0f1920fdfb 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -51,7 +51,6 @@ do_lavfi_pixfmts(){ } # all these filters have exactly one input and exactly one output -do_lavfi_pixfmts "kerndeint" "kerndeint" "" "tinterlace=interleave_top," do_lavfi_pixfmts "tinterlace_merge" "tinterlace" "merge" do_lavfi_pixfmts "tinterlace_pad" "tinterlace" "pad" diff --git a/tests/ref/lavfi/kerndeint b/tests/ref/fate/filter-pixfmts-kerndeint index 276931981c..276931981c 100644 --- a/tests/ref/lavfi/kerndeint +++ b/tests/ref/fate/filter-pixfmts-kerndeint |