From 3fdd82768d57dd8e644082fc1b3fec39360492d4 Mon Sep 17 00:00:00 2001
From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Sat, 19 Sep 2009 10:53:23 +0000
Subject: Use default sws_flags for dnxhd regression tests and also test the
 "-mbd rd" variant of the encoder.

Originally committed as revision 19923 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 tests/codec-regression.sh     | 11 +++++++----
 tests/rotozoom.regression.ref | 16 ++++++++++------
 tests/vsynth.regression.ref   | 16 ++++++++++------
 3 files changed, 27 insertions(+), 16 deletions(-)

(limited to 'tests')

diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index 64e3f36274..e8ddc300a2 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -372,11 +372,14 @@ fi
 
 if [ -n "$do_dnxhd" ] ; then
 # FIXME: interlaced raw DNxHD decoding is broken
-do_video_encoding dnxhd-1080i.mov "" "-vcodec dnxhd -flags +ildct -s hd1080 -b 120Mb -pix_fmt yuv422p -an -sws_flags neighbor+bitexact"
-do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p -sws_flags neighbor+bitexact"
+do_video_encoding dnxhd-1080i.mov "" "-vcodec dnxhd -flags +ildct -s hd1080 -b 120Mb -pix_fmt yuv422p -an"
+do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p"
 
-do_video_encoding dnxhd-720p.dnxhd "" "-s hd720 -b 90Mb -pix_fmt yuv422p -an -sws_flags neighbor+bitexact"
-do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p -sws_flags neighbor+bitexact"
+do_video_encoding dnxhd-720p.dnxhd "" "-s hd720 -b 90Mb -pix_fmt yuv422p -an"
+do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p"
+
+do_video_encoding dnxhd-720p-rd.dnxhd "" "-mbd rd -s hd720 -b 90Mb -pix_fmt yuv422p -an"
+do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p"
 fi
 
 if [ -n "$do_svq1" ] ; then
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index d596514a78..3c34d6b339 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -162,14 +162,18 @@ stddev:   10.09 PSNR: 28.04 bytes:  7603200/  7603200
 14400000 ./tests/data/a-dv50.dv
 af3f2dd5ab62c1a1d98b07d4aeb6852f *./tests/data/dv50.rotozoom.out.yuv
 stddev:    0.82 PSNR: 49.81 bytes:  7603200/  7603200
-e315015a1319202bd8b6138adb2868d0 *./tests/data/a-dnxhd-1080i.mov
+981a11fcd1f5419facc016a7608b3df9 *./tests/data/a-dnxhd-1080i.mov
 30311415 ./tests/data/a-dnxhd-1080i.mov
-f324e370fa360839f718e9b3920a6e99 *./tests/data/dnxhd.rotozoom.out.yuv
-stddev:    0.84 PSNR: 49.54 bytes:  7603200/  7603200
-a4504ebdf689b683ab48c26abfea410b *./tests/data/a-dnxhd-720p.dnxhd
+a0119aa04a86c80d6dfd0776c9ece580 *./tests/data/dnxhd.rotozoom.out.yuv
+stddev:    1.53 PSNR: 44.37 bytes:  7603200/  7603200
+1ab8a3f04bde27c33e92fe110892e2cd *./tests/data/a-dnxhd-720p.dnxhd
 22937600 ./tests/data/a-dnxhd-720p.dnxhd
-117c8574c2940df3558ac82db337016a *./tests/data/dnxhd.rotozoom.out.yuv
-stddev:    0.72 PSNR: 50.90 bytes:  7603200/  7603200
+7d546dc6d2bc87551614c0f730c59e1f *./tests/data/dnxhd.rotozoom.out.yuv
+stddev:    2.10 PSNR: 41.64 bytes:  7603200/  7603200
+bf8621a44fb65452aded9cbdece81aa2 *./tests/data/a-dnxhd-720p-rd.dnxhd
+22937600 ./tests/data/a-dnxhd-720p-rd.dnxhd
+e556f5fe58df25b5b07930148a23a553 *./tests/data/dnxhd.rotozoom.out.yuv
+stddev:    1.54 PSNR: 44.33 bytes:  7603200/  7603200
 7f9fbe4890bc1df67867bf03803dca48 *./tests/data/a-svq1.mov
 766851 ./tests/data/a-svq1.mov
 aa03471dac3f49455a33a2b19fda1098 *./tests/data/svq1.rotozoom.out.yuv
diff --git a/tests/vsynth.regression.ref b/tests/vsynth.regression.ref
index c6d8bfa8f8..3258254689 100644
--- a/tests/vsynth.regression.ref
+++ b/tests/vsynth.regression.ref
@@ -162,14 +162,18 @@ stddev:   30.76 PSNR: 18.36 bytes:  7603200/  7603200
 14400000 ./tests/data/a-dv50.dv
 a2ff093e93ffed10f730fa21df02fc50 *./tests/data/dv50.vsynth.out.yuv
 stddev:    1.72 PSNR: 43.37 bytes:  7603200/  7603200
-78ae79c285b3a7607b8be96e925d0795 *./tests/data/a-dnxhd-1080i.mov
+8ff3c18dabe28509b4e5b3fdaa7f0856 *./tests/data/a-dnxhd-1080i.mov
 30311415 ./tests/data/a-dnxhd-1080i.mov
-6674aca7d4bc08543a3c316af82207c0 *./tests/data/dnxhd.vsynth.out.yuv
-stddev:    2.24 PSNR: 41.10 bytes:  7603200/  7603200
-fcb138df8e991e2e2133044da234f36b *./tests/data/a-dnxhd-720p.dnxhd
+52f50a8031eebf980a1303e4744a49f8 *./tests/data/dnxhd.vsynth.out.yuv
+stddev:    6.28 PSNR: 32.16 bytes:  7603200/  7603200
+d206daba40f3c1be8b834de8a41e984c *./tests/data/a-dnxhd-720p.dnxhd
 22937600 ./tests/data/a-dnxhd-720p.dnxhd
-a5810fbc20aaed082b701c839da10c75 *./tests/data/dnxhd.vsynth.out.yuv
-stddev:    1.28 PSNR: 45.97 bytes:  7603200/  7603200
+d7f14ee0dd3a4df95f05999677da348b *./tests/data/dnxhd.vsynth.out.yuv
+stddev:    6.39 PSNR: 32.00 bytes:  7603200/  7603200
+c0a42b916489d3c1d0a315974821e28d *./tests/data/a-dnxhd-720p-rd.dnxhd
+22937600 ./tests/data/a-dnxhd-720p-rd.dnxhd
+50efe763b272af3367985218aff68b1b *./tests/data/dnxhd.vsynth.out.yuv
+stddev:    6.25 PSNR: 32.20 bytes:  7603200/  7603200
 595fc4e38734521356b60e67b813f0fa *./tests/data/a-svq1.mov
 1334367 ./tests/data/a-svq1.mov
 9cc35c54b2c77d36bd7e308b393c1f81 *./tests/data/svq1.vsynth.out.yuv
-- 
cgit v1.2.3