(using .asf as our .ogg muxer depends on libogg, nut muxer depends on libnut and vorbis in avi/mpeg is not really a good idea) Originally committed as revision 7874 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -198,3 +198,7 @@ stddev:2106.00 PSNR:29.85 bytes:1048576 | |||||
| 8d05d345bc14153f3d0da95fdf34e084 *./data/out.wav | 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 | ||||
| 6a55c7b433fbe4cd1ca21d149aaeb525 *./data/a-vorbis.asf | |||||
| 35686 ./data/a-vorbis.asf | |||||
| 295d828df6167db030d0812ce1a8fd93 *./data/out.wav | |||||
| stddev:3882.46 PSNR:24.54 bytes:1056768 | |||||
| @@ -70,6 +70,7 @@ else | |||||
| do_adpcm_ms=y | do_adpcm_ms=y | ||||
| do_flac=y | do_flac=y | ||||
| do_wma=y | do_wma=y | ||||
| do_vorbis=y | |||||
| do_rc=y | do_rc=y | ||||
| do_mpeg4adv=y | do_mpeg4adv=y | ||||
| do_mpeg4thread=y | do_mpeg4thread=y | ||||
| @@ -554,6 +555,12 @@ do_audio_decoding | |||||
| $tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile | $tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile | ||||
| fi | fi | ||||
| ################################### | |||||
| if [ -n "$do_vorbis" ] ; then | |||||
| # vorbis | |||||
| do_audio_encoding vorbis.asf "-ar 44100" "-acodec vorbis" | |||||
| do_audio_decoding | |||||
| fi | |||||
| ################################### | ################################### | ||||
| # libavformat testing | # libavformat testing | ||||
| @@ -198,3 +198,7 @@ stddev:2106.00 PSNR:29.85 bytes:1048576 | |||||
| 8d05d345bc14153f3d0da95fdf34e084 *./data/out.wav | 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 | ||||
| 6a55c7b433fbe4cd1ca21d149aaeb525 *./data/a-vorbis.asf | |||||
| 35686 ./data/a-vorbis.asf | |||||
| 295d828df6167db030d0812ce1a8fd93 *./data/out.wav | |||||
| stddev:3882.46 PSNR:24.54 bytes:1056768 | |||||