remove md5 check for wma as there are rounding differences between cpus
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Feb 2007 19:59:38 +0000 (19:59 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Feb 2007 19:59:38 +0000 (19:59 +0000)
Originally committed as revision 7954 to svn://svn.ffmpeg.org/ffmpeg/trunk

tests/ffmpeg.regression.ref
tests/regression.sh
tests/rotozoom.regression.ref

index 01335cd50419df5a8e7f33e20d8400fa936883ff..fe3be7214fb65d026409b942c2e75a3b27c02c0b 100644 (file)
@@ -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
index d40ad1a3ee9ea8dac5642e99f11b41a495bd1fb4..b78b38ccb7ed1f34b0432e65e3c041994acd1b43 100755 (executable)
@@ -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
 
index 4800c22181d48573620fcc2e2853cfd5c838859c..957a606704f53d4c072c86fa4bb4e21d71f64120 100644 (file)
@@ -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