From 92f1bed14cef9c3a48adf84ef838b78ba61a6d72 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Thu, 3 Jan 2013 19:48:01 +0100 Subject: tests/lavfi-regression: always require three parameters in do_lavfi_pixfmts() Force commands to specify the name of the test to run. This simplifies extending the function with a new parameter, which will be done in a following patch. --- tests/lavfi-regression.sh | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) (limited to 'tests/lavfi-regression.sh') diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index 6278f0a36a..741e716c26 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -76,16 +76,10 @@ do_lavfi_plain "alphaextract_yuv" "[in]format=yuv420p,split,alphamerge,split[o do_lavfi_colormatrix "colormatrix" bt709 fcc bt601 smpte240m do_lavfi_pixfmts(){ - # if there are three parameters, the first param is the test name - if [ -n "$3" ]; then - testname=$1; - shift; - else - testname=pixfmts_$1; - fi + testname=$1; test ${test%_[bl]e} = $testname || return 0 - filter=$1 - filter_args=$2 + filter=$2 + filter_args=$3 showfiltfmts="$target_exec $target_path/libavfilter/filtfmts-test" scale_exclude_fmts=${outfile}${testname}_scale_exclude_fmts @@ -109,18 +103,18 @@ do_lavfi_pixfmts(){ } # all these filters have exactly one input and exactly one output -do_lavfi_pixfmts "copy" "" -do_lavfi_pixfmts "crop" "100:100:100:100" -do_lavfi_pixfmts "hflip" "" -do_lavfi_pixfmts "field" "field" "bottom" -do_lavfi_pixfmts "null" "" -do_lavfi_pixfmts "pad" "500:400:20:20" -do_lavfi_pixfmts "pixdesctest" "" -do_lavfi_pixfmts "scale" "200:100" -do_lavfi_pixfmts "super2xsai" "" -do_lavfi_pixfmts "tinterlace_merge" "tinterlace" "merge" -do_lavfi_pixfmts "tinterlace_pad" "tinterlace" "pad" -do_lavfi_pixfmts "vflip" "" +do_lavfi_pixfmts "field" "field" "bottom" +do_lavfi_pixfmts "pixfmts_copy" "copy" "" +do_lavfi_pixfmts "pixfmts_crop" "crop" "100:100:100:100" +do_lavfi_pixfmts "pixfmts_hflip" "hflip" "" +do_lavfi_pixfmts "pixfmts_null" "null" "" +do_lavfi_pixfmts "pixfmts_pad" "pad" "500:400:20:20" +do_lavfi_pixfmts "pixfmts_pixdesctest" "pixdesctest" +do_lavfi_pixfmts "pixfmts_scale" "scale" "200:100" +do_lavfi_pixfmts "pixfmts_super2xsai" "super2xsai" +do_lavfi_pixfmts "pixfmts_vflip" "vflip" +do_lavfi_pixfmts "tinterlace_merge" "tinterlace" "merge" +do_lavfi_pixfmts "tinterlace_pad" "tinterlace" "pad" do_lavfi_lavd() { label=$1 -- cgit v1.2.3