aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-12-06 19:48:16 +0100
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-12-06 19:49:33 +0100
commit6ecc78b707945458e5d126a19a8e7e1bbf2b25ee (patch)
tree4d55aff08c394106d7b20f6a6bddea30033a58e8
parente1ccc9216b5d2bfa0074c208aa5dfa2b05b5ad2a (diff)
downloadffmpeg-6ecc78b707945458e5d126a19a8e7e1bbf2b25ee.tar.gz
Choose compression level 6 for zmbv test.
The default of 9 gives different results on different FATE systems. However the zlib test using compression level 6 works, so try this instead. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
-rwxr-xr-xtests/codec-regression.sh4
-rw-r--r--tests/ref/vsynth1/zmbv4
-rw-r--r--tests/ref/vsynth2/zmbv4
3 files changed, 7 insertions, 5 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index 2d5d690352..c7dea4c6ed 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -330,7 +330,9 @@ do_video_decoding "" "-pix_fmt yuv420p"
fi
if [ -n "$do_zmbv" ] ; then
-do_video_encoding zmbv.avi "-an -vcodec zmbv"
+# default level of 9 leads to different results with
+# different zlib versions
+do_video_encoding zmbv.avi "-an -vcodec zmbv -compression_level 6"
do_video_decoding "" "-pix_fmt yuv420p"
fi
diff --git a/tests/ref/vsynth1/zmbv b/tests/ref/vsynth1/zmbv
index 12f1a870b6..1413cad8e5 100644
--- a/tests/ref/vsynth1/zmbv
+++ b/tests/ref/vsynth1/zmbv
@@ -1,4 +1,4 @@
-5874bd5764a92be48b63d90446b1b386 *./tests/data/vsynth1/zmbv.avi
-2284022 ./tests/data/vsynth1/zmbv.avi
+ed417ff88cc5d8fe204b3dcc0ba71a57 *./tests/data/vsynth1/zmbv.avi
+2325956 ./tests/data/vsynth1/zmbv.avi
cfbec364e41d70c9b177435b5655d8af *./tests/data/zmbv.vsynth1.out.yuv
stddev: 46.47 PSNR: 14.79 MAXDIFF: 129 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth2/zmbv b/tests/ref/vsynth2/zmbv
index 8b08379aa8..b5fc304a3a 100644
--- a/tests/ref/vsynth2/zmbv
+++ b/tests/ref/vsynth2/zmbv
@@ -1,4 +1,4 @@
-65825cdc90e550aeba556020365bc2d9 *./tests/data/vsynth2/zmbv.avi
-1807074 ./tests/data/vsynth2/zmbv.avi
+71e6c69ab93b2b71736f71948032c9c4 *./tests/data/vsynth2/zmbv.avi
+1864098 ./tests/data/vsynth2/zmbv.avi
cfbec364e41d70c9b177435b5655d8af *./tests/data/zmbv.vsynth2.out.yuv
stddev: 42.07 PSNR: 15.65 MAXDIFF: 112 bytes: 7603200/ 7603200