compare audio files 16bit wise instead of 8bit

additionally compare the mp2 case with some delay as this matches better (the delay issue obviously should be fixed)

Originally committed as revision 3922 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-02-01 21:16:33 +00:00
parent ba96e97fdd
commit 976709ee73
3 changed files with 12 additions and 9 deletions

View File

@ -126,18 +126,19 @@ stddev: 10.99 PSNR:27.30 bytes:7602176
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
95712 ./data/a-mp2.mp2
6956f2c5185c4edbae648c614992a14b *./data/out.wav
stddev:117.02 PSNR: 6.76 bytes:1054720
stddev:9330.70 PSNR:16.92 bytes:527360
stddev:4396.13 PSNR:23.46 bytes:526336
d056da679e6d6682812fffb28a7f0db6 *./data/a-ac3.rm
97983 ./data/a-ac3.rm
2d081e0e1f2e9bd4514e9ac8ec41884c *./data/a-g726.wav
24268 ./data/a-g726.wav
a719ab6d47d8d601520edb13bf6136b4 *./data/out.wav
stddev:134.28 PSNR: 5.56 bytes:96256
stddev:8459.88 PSNR:17.77 bytes:48128
bdc512b78e2ccb1d815aec08794650eb *./data/a-adpcm_ima.wav
266288 ./data/a-adpcm_ima.wav
1316b03da3bdc8df9785c7995e3c9b2a *./data/out.wav
stddev:129.55 PSNR: 5.87 bytes:1054720
stddev:13585.76 PSNR:13.66 bytes:527360
d2eee867856d2bdb6d08e936d4ceec0c *./data/a-adpcm_ms.wav
267308 ./data/a-adpcm_ms.wav
91a84bb4f319a3a0bf0c0441b3d3a529 *./data/out.wav
stddev: 73.79 PSNR:10.76 bytes:1054720
stddev:1050.18 PSNR:35.89 bytes:527360

View File

@ -110,7 +110,7 @@ do_ffmpeg()
if [ $f = $raw_dst ] ; then
$tiny_psnr $f $raw_ref >> $logfile
elif [ $f = $pcm_dst ] ; then
$tiny_psnr $f $pcm_ref >> $logfile
$tiny_psnr $f $pcm_ref 2 >> $logfile
else
wc -c $f >> $logfile
fi
@ -458,6 +458,7 @@ do_ffmpeg $file -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src $file
# mp2 decoding
do_ffmpeg $pcm_dst -y -i $file -f wav $pcm_dst
$tiny_psnr $pcm_dst $pcm_ref 2 1924 >> $logfile
fi
###################################

View File

@ -126,18 +126,19 @@ stddev: 3.43 PSNR:37.39 bytes:7602176
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
95712 ./data/a-mp2.mp2
6956f2c5185c4edbae648c614992a14b *./data/out.wav
stddev:117.02 PSNR: 6.76 bytes:1054720
stddev:9330.70 PSNR:16.92 bytes:527360
stddev:4396.13 PSNR:23.46 bytes:526336
d056da679e6d6682812fffb28a7f0db6 *./data/a-ac3.rm
97983 ./data/a-ac3.rm
2d081e0e1f2e9bd4514e9ac8ec41884c *./data/a-g726.wav
24268 ./data/a-g726.wav
a719ab6d47d8d601520edb13bf6136b4 *./data/out.wav
stddev:134.28 PSNR: 5.56 bytes:96256
stddev:8459.88 PSNR:17.77 bytes:48128
bdc512b78e2ccb1d815aec08794650eb *./data/a-adpcm_ima.wav
266288 ./data/a-adpcm_ima.wav
1316b03da3bdc8df9785c7995e3c9b2a *./data/out.wav
stddev:129.55 PSNR: 5.87 bytes:1054720
stddev:13585.76 PSNR:13.66 bytes:527360
d2eee867856d2bdb6d08e936d4ceec0c *./data/a-adpcm_ms.wav
267308 ./data/a-adpcm_ms.wav
91a84bb4f319a3a0bf0c0441b3d3a529 *./data/out.wav
stddev: 73.79 PSNR:10.76 bytes:1054720
stddev:1050.18 PSNR:35.89 bytes:527360