Originally committed as revision 7954 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -190,11 +190,9 @@ c4228df189aad9567a037727d0e763e4 *./data/out.wav | |||||
| stddev: 33.31 PSNR:65.87 bytes:1040384 | stddev: 33.31 PSNR:65.87 bytes:1040384 | ||||
| a2176602cfebad51f5688f793ab5d59a *./data/a-wmav1.asf | a2176602cfebad51f5688f793ab5d59a *./data/a-wmav1.asf | ||||
| 99596 ./data/a-wmav1.asf | 99596 ./data/a-wmav1.asf | ||||
| 2ab193df22bb473e61015e56ac11faf3 *./data/out.wav | |||||
| stddev:12251.50 PSNR:14.56 bytes:1056768 | stddev:12251.50 PSNR:14.56 bytes:1056768 | ||||
| stddev:2106.00 PSNR:29.85 bytes:1048576 | stddev:2106.00 PSNR:29.85 bytes:1048576 | ||||
| df1c902a4518a06afed977a8a74a60c9 *./data/a-wmav2.asf | df1c902a4518a06afed977a8a74a60c9 *./data/a-wmav2.asf | ||||
| 99602 ./data/a-wmav2.asf | 99602 ./data/a-wmav2.asf | ||||
| 8d05d345bc14153f3d0da95fdf34e084 *./data/out.wav | |||||
| stddev:12255.92 PSNR:14.55 bytes:1056768 | stddev:12255.92 PSNR:14.55 bytes:1056768 | ||||
| stddev:2099.31 PSNR:29.88 bytes:1048576 | stddev:2099.31 PSNR:29.88 bytes:1048576 | ||||
| @@ -136,6 +136,25 @@ do_ffmpeg() | |||||
| echo `cat $bench2` $f >> $benchfile | 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() | do_ffmpeg_crc() | ||||
| { | { | ||||
| f="$1" | f="$1" | ||||
| @@ -547,11 +566,11 @@ fi | |||||
| if [ -n "$do_wma" ] ; then | if [ -n "$do_wma" ] ; then | ||||
| # wmav1 | # wmav1 | ||||
| do_audio_encoding wmav1.asf "-ar 44100" "-acodec 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 | $tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile | ||||
| # wmav2 | # wmav2 | ||||
| do_audio_encoding wmav2.asf "-ar 44100" "-acodec 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 | $tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile | ||||
| fi | fi | ||||
| @@ -190,11 +190,9 @@ c4228df189aad9567a037727d0e763e4 *./data/out.wav | |||||
| stddev: 33.31 PSNR:65.87 bytes:1040384 | stddev: 33.31 PSNR:65.87 bytes:1040384 | ||||
| a2176602cfebad51f5688f793ab5d59a *./data/a-wmav1.asf | a2176602cfebad51f5688f793ab5d59a *./data/a-wmav1.asf | ||||
| 99596 ./data/a-wmav1.asf | 99596 ./data/a-wmav1.asf | ||||
| 2ab193df22bb473e61015e56ac11faf3 *./data/out.wav | |||||
| stddev:12251.50 PSNR:14.56 bytes:1056768 | stddev:12251.50 PSNR:14.56 bytes:1056768 | ||||
| stddev:2106.00 PSNR:29.85 bytes:1048576 | stddev:2106.00 PSNR:29.85 bytes:1048576 | ||||
| df1c902a4518a06afed977a8a74a60c9 *./data/a-wmav2.asf | df1c902a4518a06afed977a8a74a60c9 *./data/a-wmav2.asf | ||||
| 99602 ./data/a-wmav2.asf | 99602 ./data/a-wmav2.asf | ||||
| 8d05d345bc14153f3d0da95fdf34e084 *./data/out.wav | |||||
| stddev:12255.92 PSNR:14.55 bytes:1056768 | stddev:12255.92 PSNR:14.55 bytes:1056768 | ||||
| stddev:2099.31 PSNR:29.88 bytes:1048576 | stddev:2099.31 PSNR:29.88 bytes:1048576 | ||||