From d9076fe7c375e1ad2a5aff0071037bdc5d7116fa Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 12 Feb 2007 19:59:38 +0000 Subject: remove md5 check for wma as there are rounding differences between cpus Originally committed as revision 7954 to svn://svn.ffmpeg.org/ffmpeg/trunk --- tests/regression.sh | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'tests/regression.sh') 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 -- cgit v1.2.3