diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-02-12 19:59:38 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-02-12 19:59:38 +0000 |
| commit | d9076fe7c375e1ad2a5aff0071037bdc5d7116fa (patch) | |
| tree | dcd8dc21881edd8f36fb30379782687a590a1138 | |
| parent | 0786943a00faaa555517846c0f62e6cb43237e79 (diff) | |
| download | ffmpeg-d9076fe7c375e1ad2a5aff0071037bdc5d7116fa.tar.gz | |
remove md5 check for wma as there are rounding differences between cpus
Originally committed as revision 7954 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | tests/ffmpeg.regression.ref | 2 | ||||
| -rwxr-xr-x | tests/regression.sh | 23 | ||||
| -rw-r--r-- | tests/rotozoom.regression.ref | 2 |
3 files changed, 21 insertions, 6 deletions
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index 01335cd504..fe3be7214f 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -190,11 +190,9 @@ c4228df189aad9567a037727d0e763e4 *./data/out.wav stddev: 33.31 PSNR:65.87 bytes:1040384 a2176602cfebad51f5688f793ab5d59a *./data/a-wmav1.asf 99596 ./data/a-wmav1.asf -2ab193df22bb473e61015e56ac11faf3 *./data/out.wav stddev:12251.50 PSNR:14.56 bytes:1056768 stddev:2106.00 PSNR:29.85 bytes:1048576 df1c902a4518a06afed977a8a74a60c9 *./data/a-wmav2.asf 99602 ./data/a-wmav2.asf -8d05d345bc14153f3d0da95fdf34e084 *./data/out.wav stddev:12255.92 PSNR:14.55 bytes:1056768 stddev:2099.31 PSNR:29.88 bytes:1048576 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 diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref index 4800c22181..957a606704 100644 --- a/tests/rotozoom.regression.ref +++ b/tests/rotozoom.regression.ref @@ -190,11 +190,9 @@ c4228df189aad9567a037727d0e763e4 *./data/out.wav stddev: 33.31 PSNR:65.87 bytes:1040384 a2176602cfebad51f5688f793ab5d59a *./data/a-wmav1.asf 99596 ./data/a-wmav1.asf -2ab193df22bb473e61015e56ac11faf3 *./data/out.wav stddev:12251.50 PSNR:14.56 bytes:1056768 stddev:2106.00 PSNR:29.85 bytes:1048576 df1c902a4518a06afed977a8a74a60c9 *./data/a-wmav2.asf 99602 ./data/a-wmav2.asf -8d05d345bc14153f3d0da95fdf34e084 *./data/out.wav stddev:12255.92 PSNR:14.55 bytes:1056768 stddev:2099.31 PSNR:29.88 bytes:1048576 |