fate: move colormatrix tests to the new system.
authorClément Bœsch <ubitux@gmail.com>
Mon, 29 Apr 2013 18:11:08 +0000 (20:11 +0200)
committerClément Bœsch <ubitux@gmail.com>
Mon, 29 Apr 2013 18:20:13 +0000 (20:20 +0200)
tests/fate/avfilter.mak
tests/fate/filter-video.mak
tests/lavfi-regression.sh
tests/ref/fate/filter-colormatrix1 [new file with mode: 0644]
tests/ref/fate/filter-colormatrix2 [new file with mode: 0644]
tests/ref/lavfi/colormatrix1 [deleted file]
tests/ref/lavfi/colormatrix2 [deleted file]

index aca0baf..912563b 100644 (file)
@@ -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                   \
index 1e1c7f7..86f6e13 100644 (file)
@@ -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"
 
index 547cae0..d27f07f 100755 (executable)
@@ -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/fate/filter-colormatrix1 b/tests/ref/fate/filter-colormatrix1
new file mode 100644 (file)
index 0000000..9ec093d
--- /dev/null
@@ -0,0 +1 @@
+colormatrix1        600fef16b66cff4ee76540ff2a8f4480
diff --git a/tests/ref/fate/filter-colormatrix2 b/tests/ref/fate/filter-colormatrix2
new file mode 100644 (file)
index 0000000..9961bae
--- /dev/null
@@ -0,0 +1 @@
+colormatrix2        e4ba95b7dd5e0862aa5f5e3ddc54bda4
diff --git a/tests/ref/lavfi/colormatrix1 b/tests/ref/lavfi/colormatrix1
deleted file mode 100644 (file)
index 9ec093d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-colormatrix1        600fef16b66cff4ee76540ff2a8f4480
diff --git a/tests/ref/lavfi/colormatrix2 b/tests/ref/lavfi/colormatrix2
deleted file mode 100644 (file)
index 9961bae..0000000
+++ /dev/null
@@ -1 +0,0 @@
-colormatrix2        e4ba95b7dd5e0862aa5f5e3ddc54bda4