summaryrefslogtreecommitdiff
path: root/tests/regression.sh
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-02-12 19:59:38 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-02-12 19:59:38 +0000
commitd9076fe7c375e1ad2a5aff0071037bdc5d7116fa (patch)
treedcd8dc21881edd8f36fb30379782687a590a1138 /tests/regression.sh
parent0786943a00faaa555517846c0f62e6cb43237e79 (diff)
remove md5 check for wma as there are rounding differences between cpus
Originally committed as revision 7954 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests/regression.sh')
-rwxr-xr-xtests/regression.sh23
1 files changed, 21 insertions, 2 deletions
diff --git a/tests/regression.sh b/tests/regression.sh
index d40ad1a3ee..b78b38ccb7 100755
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -136,6 +136,25 @@ do_ffmpeg()
echo `cat $bench2` $f >> $benchfile
}
+do_ffmpeg_nomd5()
+{
+ f="$1"
+ shift
+ echo $ffmpeg $FFMPEG_OPTS $*
+ $ffmpeg $FFMPEG_OPTS -benchmark $* > $bench 2> /tmp/ffmpeg$$
+ egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true
+ rm -f /tmp/ffmpeg$$
+ if [ $f = $raw_dst ] ; then
+ $tiny_psnr $f $raw_ref >> $logfile
+ elif [ $f = $pcm_dst ] ; then
+ $tiny_psnr $f $pcm_ref 2 >> $logfile
+ else
+ wc -c $f >> $logfile
+ fi
+ expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2
+ echo `cat $bench2` $f >> $benchfile
+}
+
do_ffmpeg_crc()
{
f="$1"
@@ -547,11 +566,11 @@ fi
if [ -n "$do_wma" ] ; then
# wmav1
do_audio_encoding wmav1.asf "-ar 44100" "-acodec wmav1"
-do_audio_decoding
+do_ffmpeg_nomd5 $pcm_dst -y -i $file -f wav $pcm_dst
$tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile
# wmav2
do_audio_encoding wmav2.asf "-ar 44100" "-acodec wmav2"
-do_audio_decoding
+do_ffmpeg_nomd5 $pcm_dst -y -i $file -f wav $pcm_dst
$tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile
fi