Originally committed as revision 7865 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
@@ -188,3 +188,13 @@ c3382f03ce2efb5d475240d288a33898 *./data/a-flac.flac | |||||
353368 ./data/a-flac.flac | 353368 ./data/a-flac.flac | ||||
c4228df189aad9567a037727d0e763e4 *./data/out.wav | c4228df189aad9567a037727d0e763e4 *./data/out.wav | ||||
stddev: 33.31 PSNR:65.87 bytes:1040384 | stddev: 33.31 PSNR:65.87 bytes:1040384 | ||||
75d124394e3e8b733f5563bd282eec85 *./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 | |||||
23d66614fc8bd437e3ca8c1c6c345a33 *./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 |
@@ -69,6 +69,7 @@ else | |||||
do_adpcm_ima_wav=y | do_adpcm_ima_wav=y | ||||
do_adpcm_ms=y | do_adpcm_ms=y | ||||
do_flac=y | do_flac=y | ||||
do_wma=y | |||||
do_rc=y | do_rc=y | ||||
do_mpeg4adv=y | do_mpeg4adv=y | ||||
do_mpeg4thread=y | do_mpeg4thread=y | ||||
@@ -541,6 +542,19 @@ do_audio_encoding flac.flac "-ar 44100" "-acodec flac -compression_level 2" | |||||
do_audio_decoding | do_audio_decoding | ||||
fi | fi | ||||
################################### | |||||
if [ -n "$do_wma" ] ; then | |||||
# wmav1 | |||||
do_audio_encoding wmav1.asf "-ar 44100" "-acodec wmav1" | |||||
do_audio_decoding | |||||
$tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile | |||||
# wmav2 | |||||
do_audio_encoding wmav2.asf "-ar 44100" "-acodec wmav2" | |||||
do_audio_decoding | |||||
$tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile | |||||
fi | |||||
################################### | ################################### | ||||
# libavformat testing | # libavformat testing | ||||
################################### | ################################### | ||||
@@ -188,3 +188,13 @@ c3382f03ce2efb5d475240d288a33898 *./data/a-flac.flac | |||||
353368 ./data/a-flac.flac | 353368 ./data/a-flac.flac | ||||
c4228df189aad9567a037727d0e763e4 *./data/out.wav | c4228df189aad9567a037727d0e763e4 *./data/out.wav | ||||
stddev: 33.31 PSNR:65.87 bytes:1040384 | stddev: 33.31 PSNR:65.87 bytes:1040384 | ||||
75d124394e3e8b733f5563bd282eec85 *./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 | |||||
23d66614fc8bd437e3ca8c1c6c345a33 *./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 |