aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-02-12 11:52:10 +0100
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-02-18 16:41:39 +0100
commitf23a740303e0ae54f2dac936188475b9a9c761fc (patch)
tree8c08bab3d938525ee0063549ef604779594a6a67 /tests
parentf3bd226de653fe1335a6b33a41319e106c16204c (diff)
downloadffmpeg-f23a740303e0ae54f2dac936188475b9a9c761fc.tar.gz
Add muxer test based on stream-copy from FATE sample.
This should test muxing Theora into Ogg. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile4
-rwxr-xr-xtests/fate-run.sh6
-rwxr-xr-xtests/lavf-regression.sh12
-rw-r--r--tests/ref/lavf-fate/ogg_vp33
-rwxr-xr-xtests/regression-funcs.sh1
5 files changed, 25 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 072290639f..97f595b112 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -81,6 +81,7 @@ FATE_ACODEC = $(ACODEC_TESTS:%=fate-acodec-%)
FATE_VSYNTH1 = $(VCODEC_TESTS:%=fate-vsynth1-%)
FATE_VSYNTH2 = $(VCODEC_TESTS:%=fate-vsynth2-%)
FATE_VCODEC = $(FATE_VSYNTH1) $(FATE_VSYNTH2)
+FATE_LAVF_FATE = $(LAVF_FATE_TESTS:%=fate-lavf-fate-%)
FATE_LAVF = $(LAVF_TESTS:%=fate-lavf-%)
FATE_LAVFI = $(LAVFI_TESTS:%=fate-lavfi-%)
FATE_SEEK = $(SEEK_TESTS:seek_%=fate-seek-%)
@@ -104,6 +105,7 @@ $(FATE_SEEK): fate-codec fate-lavf libavformat/seek-test$(EXESUF)
$(FATE_ACODEC): CMD = codectest acodec
$(FATE_VSYNTH1): CMD = codectest vsynth1
$(FATE_VSYNTH2): CMD = codectest vsynth2
+$(FATE_LAVF_FATE): CMD = lavffatetest
$(FATE_LAVF): CMD = lavftest
$(FATE_LAVFI): CMD = lavfitest
$(FATE_SEEK): CMD = seektest
@@ -111,11 +113,13 @@ $(FATE_SEEK): CMD = seektest
fate-codec: fate-acodec fate-vcodec
fate-acodec: $(FATE_ACODEC)
fate-vcodec: $(FATE_VCODEC)
+fate-lavf-fate: $(FATE_LAVF_FATE)
fate-lavf: $(FATE_LAVF)
fate-lavfi: $(FATE_LAVFI)
fate-seek: $(FATE_SEEK)
ifdef SAMPLES
+FATE += $(FATE_LAVF_FATE)
FATE += $(FATE_TESTS) $(FATE_TESTS-yes)
fate-rsync:
rsync -vaLW --timeout=60 --contimeout=60 rsync://fate.ffmpeg.org/fate-suite/ $(SAMPLES)
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 2f92a7dda6..d7b5e7e83b 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -77,13 +77,17 @@ pcm(){
regtest(){
t="${test#$2-}"
ref=${base}/ref/$2/$t
- ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$tool"
+ ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$tool" "$samples"
}
codectest(){
regtest codec $1 tests/$1
}
+lavffatetest(){
+ regtest lavf lavf-fate tests/vsynth1
+}
+
lavftest(){
regtest lavf lavf tests/vsynth1
}
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 49c77e84fd..316170bc51 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -13,6 +13,14 @@ eval do_$test=y
ENC_OPTS="$ENC_OPTS -metadata title=lavftest"
+do_lavf_fate()
+{
+ file=${outfile}lavf.$1
+ input="${samples}/$2"
+ do_avconv $file $DEC_OPTS -i "$input" $ENC_OPTS -vcodec copy -acodec copy
+ do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
+}
+
do_lavf()
{
file=${outfile}lavf.$1
@@ -126,6 +134,10 @@ if [ -n "$do_mkv" ] ; then
do_lavf mkv "-acodec mp2 -ab 64k -vcodec mpeg4"
fi
+if [ -n "$do_ogg_vp3" ] ; then
+do_lavf_fate ogg "vp3/coeff_level64.mkv"
+fi
+
if [ -n "$do_wtv" ] ; then
do_lavf wtv "-acodec mp2"
fi
diff --git a/tests/ref/lavf-fate/ogg_vp3 b/tests/ref/lavf-fate/ogg_vp3
new file mode 100644
index 0000000000..9f36eeebc2
--- /dev/null
+++ b/tests/ref/lavf-fate/ogg_vp3
@@ -0,0 +1,3 @@
+cf4184d736685fb698bb3be4656353bd *./tests/data/lavf-fate/lavf.ogg
+417698 ./tests/data/lavf-fate/lavf.ogg
+./tests/data/lavf-fate/lavf.ogg CRC=0x45a9df79
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index b0a9b85fad..1cafb3f414 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -11,6 +11,7 @@ target_exec=$4
target_path=$5
threads=${6:-1}
tool=$8
+samples=$9
datadir="./tests/data"
target_datadir="${target_path}/${datadir}"