diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-29 20:11:08 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-29 20:20:13 +0200 |
| commit | 9a0e40ec8c0c0b04f32173f65ef73a6cc370d17a (patch) | |
| tree | 5158831034d797163562ec5e729f34cc9e00efaf | |
| parent | 80bcbed1574712396782e6f79698d364ade4ba63 (diff) | |
fate: move colormatrix tests to the new system.
| -rw-r--r-- | tests/fate/avfilter.mak | 4 | ||||
| -rw-r--r-- | tests/fate/filter-video.mak | 6 | ||||
| -rwxr-xr-x | tests/lavfi-regression.sh | 7 | ||||
| -rw-r--r-- | tests/ref/fate/filter-colormatrix1 (renamed from tests/ref/lavfi/colormatrix1) | 0 | ||||
| -rw-r--r-- | tests/ref/fate/filter-colormatrix2 (renamed from tests/ref/lavfi/colormatrix2) | 0 |
5 files changed, 7 insertions, 10 deletions
diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak index aca0bafacf..912563b403 100644 --- a/tests/fate/avfilter.mak +++ b/tests/fate/avfilter.mak @@ -11,9 +11,7 @@ FATE_LAVFI-$(CONFIG_AVDEVICE) += fate-lavfi-life \ fate-lavfi-scalenorm \ fate-lavfi-testsrc \ -FATE_LAVFI-$(CONFIG_GPL) += fate-lavfi-colormatrix1 \ - fate-lavfi-colormatrix2 \ - fate-lavfi-kerndeint \ +FATE_LAVFI-$(CONFIG_GPL) += fate-lavfi-kerndeint \ fate-lavfi-pixfmts_super2xsai \ fate-lavfi-tinterlace_merge \ fate-lavfi-tinterlace_pad \ diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 1e1c7f7a21..86f6e13378 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -96,6 +96,12 @@ 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-$(CONFIG_COLORMATRIX_FILTER) += fate-filter-colormatrix1 +fate-filter-colormatrix1: CMD = video_filter "colormatrix=bt601:smpte240m,colormatrix=smpte240m:fcc,colormatrix=fcc:bt601,colormatrix=bt601:fcc,colormatrix=fcc:smpte240m,colormatrix=smpte240m:bt709" + +FATE_FILTER_VSYNTH-$(CONFIG_COLORMATRIX_FILTER) += fate-filter-colormatrix2 +fate-filter-colormatrix2: CMD = video_filter "colormatrix=bt709:fcc,colormatrix=fcc:bt709,colormatrix=bt709:bt601,colormatrix=bt601:bt709,colormatrix=bt709:smpte240m,colormatrix=smpte240m:bt601" + 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" diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index 547cae0121..d27f07faec 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -34,18 +34,11 @@ do_lavfi() { do_lavfi_plain $1 "$2" } -do_lavfi_colormatrix() { - do_lavfi "${1}1" "$1=$4:$5,$1=$5:$3,$1=$3:$4,$1=$4:$3,$1=$3:$5,$1=$5:$2" - do_lavfi "${1}2" "$1=$2:$3,$1=$3:$2,$1=$2:$4,$1=$4:$2,$1=$2:$5,$1=$5:$4" -} - do_lavfi_plain "alphamerge_rgb" "[in]format=bgra,split,alphamerge[out]" do_lavfi_plain "alphamerge_yuv" "[in]format=yuv420p,split,alphamerge[out]" do_lavfi_plain "alphaextract_rgb" "[in]format=bgra,split,alphamerge,split[o3][o4];[o4]alphaextract[alpha];[o3][alpha]alphamerge[out]" do_lavfi_plain "alphaextract_yuv" "[in]format=yuv420p,split,alphamerge,split[o3][o4];[o4]alphaextract[alpha];[o3][alpha]alphamerge[out]" -do_lavfi_colormatrix "colormatrix" bt709 fcc bt601 smpte240m - do_lavfi_pixfmts(){ testname=$1; test ${test%_[bl]e} = $testname || return 0 diff --git a/tests/ref/lavfi/colormatrix1 b/tests/ref/fate/filter-colormatrix1 index 9ec093d90a..9ec093d90a 100644 --- a/tests/ref/lavfi/colormatrix1 +++ b/tests/ref/fate/filter-colormatrix1 diff --git a/tests/ref/lavfi/colormatrix2 b/tests/ref/fate/filter-colormatrix2 index 9961bae4e5..9961bae4e5 100644 --- a/tests/ref/lavfi/colormatrix2 +++ b/tests/ref/fate/filter-colormatrix2 |