Add some ad-hoc tests for libavfilter.

A patched version of ffmpeg supporting video filters is required for
getting this working; thus make lavfitest is supposed to work only in
the libavfilter repository for now.

Originally committed as revision 22586 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index 2d37c0a440f7f0e011c8881da2640c3bc4279844..48df7670c33c608f33b4bea2133e5fc2c14e149c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -250,7 +250,17 @@ LAVF_TESTS-$(call MUXDEM,VOC)                += voc
 LAVF_TESTS-$(call MUXDEM,WAV)                += wav
 LAVF_TESTS-$(call MUXDEM,YUV4MPEGPIPE)       += yuv4mpeg
 
-LAVFI_TESTS =
+LAVFI_TESTS =           \
+    crop                \
+    crop_scale          \
+    crop_scale_vflip    \
+    crop_vflip          \
+    null                \
+    scale200            \
+    scale500            \
+    vflip               \
+    vflip_crop          \
+    vflip_vflip         \
 
 ACODEC_TESTS := $(addprefix regtest-, $(ACODEC_TESTS) $(ACODEC_TESTS-yes))
 VCODEC_TESTS := $(addprefix regtest-, $(VCODEC_TESTS) $(VCODEC_TESTS-yes))
@@ -261,8 +271,7 @@ CODEC_TESTS = $(VCODEC_TESTS) $(ACODEC_TESTS)
 
 codectest: $(CODEC_TESTS)
 lavftest:  $(LAVF_TESTS)
-
-# lavfitest: $(LAVFI_TESTS)
+lavfitest: $(LAVFI_TESTS)
 
 $(ACODEC_TESTS): regtest-aref
 $(VCODEC_TESTS): regtest-vref

diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
index 1f52fd7eee0ba55ff3cb3fb38d08be67b7fcaa0c..6f82eb94755ad1ec8ae2591bf18f9c2e844c161d 100755 (executable)
--- a/tests/lavfi-regression.sh
+++ b/tests/lavfi-regression.sh
@@ -20,14 +20,20 @@ do_lavfi() {
     vfilters=$2
 
     if [ -n "$test" ] ; then
-        do_video_encoding ${test_name}.avi "" "-vcodec rawvideo -vfilters $vfilters"
+        do_video_encoding ${test_name}.nut "" "-vcodec rawvideo -vfilters $vfilters"
     fi
 }
 
-# example tests:
-# do_lavfi "crop" "crop=100:100:-1:-1"
-# do_lavfi "crop_scale" "crop=100:100,scale=200:-1"
-# do_lavfi "scale" "scale=200:200"
+do_lavfi "crop"               "crop=100:100"
+do_lavfi "crop_scale"         "crop=100:100,scale=400:-1"
+do_lavfi "crop_scale_vflip"   "null,null,crop=200:200,crop=20:20,scale=200:200,scale=250:250,vflip,vflip,null,scale=200:200,crop=100:100,vflip,scale=200:200,null,vflip,crop=100:100,null"
+do_lavfi "crop_vflip"         "crop=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=100:100"
+do_lavfi "vflip_vflip"        "vflip,vflip"
 
 # TODO: add tests for
 # direct rendering,

diff --git a/tests/ref/lavfi/crop b/tests/ref/lavfi/crop
new file mode 100644 (file)
index 0000000..75c39f7
--- /dev/null
+++ b/tests/ref/lavfi/crop
@@ -0,0 +1,2 @@
+3d163f156eaddf41d2be20736f973539 *./tests/data/lavfi/crop.nut
+3554654 ./tests/data/lavfi/crop.nut

diff --git a/tests/ref/lavfi/crop_scale b/tests/ref/lavfi/crop_scale
new file mode 100644 (file)
index 0000000..48a0734
--- /dev/null
+++ b/tests/ref/lavfi/crop_scale
@@ -0,0 +1,2 @@
+4ffe30abe99931bc9989f40ae65654b7 *./tests/data/lavfi/crop_scale.nut
+8941454 ./tests/data/lavfi/crop_scale.nut

diff --git a/tests/ref/lavfi/crop_scale_vflip b/tests/ref/lavfi/crop_scale_vflip
new file mode 100644 (file)
index 0000000..314f407
--- /dev/null
+++ b/tests/ref/lavfi/crop_scale_vflip
@@ -0,0 +1,2 @@
+3b1c81bb6ce7575f5ee3088ea165dbe7 *./tests/data/lavfi/crop_scale_vflip.nut
+750727 ./tests/data/lavfi/crop_scale_vflip.nut

diff --git a/tests/ref/lavfi/crop_vflip b/tests/ref/lavfi/crop_vflip
new file mode 100644 (file)
index 0000000..96fc9bd
--- /dev/null
+++ b/tests/ref/lavfi/crop_vflip
@@ -0,0 +1,2 @@
+628542e17b6900ee79b1429183ae01b0 *./tests/data/lavfi/crop_vflip.nut
+3554654 ./tests/data/lavfi/crop_vflip.nut

diff --git a/tests/ref/lavfi/null b/tests/ref/lavfi/null
new file mode 100644 (file)
index 0000000..b4d006e
--- /dev/null
+++ b/tests/ref/lavfi/null
@@ -0,0 +1,2 @@
+eba2f135a08829387e2f698ff72a2939 *./tests/data/lavfi/null.nut
+7604654 ./tests/data/lavfi/null.nut

diff --git a/tests/ref/lavfi/scale200 b/tests/ref/lavfi/scale200
new file mode 100644 (file)
index 0000000..115e250
--- /dev/null
+++ b/tests/ref/lavfi/scale200
@@ -0,0 +1,2 @@
+f7325609fdb8992bcea0cf3712ea2afc *./tests/data/lavfi/scale200.nut
+3001204 ./tests/data/lavfi/scale200.nut

diff --git a/tests/ref/lavfi/scale500 b/tests/ref/lavfi/scale500
new file mode 100644 (file)
index 0000000..c8ba15b
--- /dev/null
+++ b/tests/ref/lavfi/scale500
@@ -0,0 +1,2 @@
+7e194861897fb42e20771711fe1aace3 *./tests/data/lavfi/scale500.nut
+18751503 ./tests/data/lavfi/scale500.nut

diff --git a/tests/ref/lavfi/vflip b/tests/ref/lavfi/vflip
new file mode 100644 (file)
index 0000000..977f2d2
--- /dev/null
+++ b/tests/ref/lavfi/vflip
@@ -0,0 +1,2 @@
+2e6d6062e8cad37fb3ab2c433b55f382 *./tests/data/lavfi/vflip.nut
+7604654 ./tests/data/lavfi/vflip.nut

diff --git a/tests/ref/lavfi/vflip_crop b/tests/ref/lavfi/vflip_crop
new file mode 100644 (file)
index 0000000..bd19894
--- /dev/null
+++ b/tests/ref/lavfi/vflip_crop
@@ -0,0 +1,2 @@
+72ee0d0dfc8af0cd94a466760313654d *./tests/data/lavfi/vflip_crop.nut
+3554654 ./tests/data/lavfi/vflip_crop.nut

diff --git a/tests/ref/lavfi/vflip_vflip b/tests/ref/lavfi/vflip_vflip
new file mode 100644 (file)
index 0000000..55595dd
--- /dev/null
+++ b/tests/ref/lavfi/vflip_vflip
@@ -0,0 +1,2 @@
+eba2f135a08829387e2f698ff72a2939 *./tests/data/lavfi/vflip_vflip.nut
+7604654 ./tests/data/lavfi/vflip_vflip.nut