do_adpcm_ms=y
do_flac=y
do_wma=y
+ do_vorbis=y
do_rc=y
do_mpeg4adv=y
do_mpeg4thread=y
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"
do_audio_encoding()
{
file=${outfile}$1
- do_ffmpeg $file -y -ab 128 -ac 2 -f s16le -i $pcm_src $3 $file
+ do_ffmpeg $file -y -ab 128k -ac 2 -f s16le -i $pcm_src $3 $file
}
do_audio_decoding()
do_image_formats()
{
file=${outfile}libav%02d.$1
- $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $2 $3 $file
+ $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $2 $3 -flags +bitexact $file
do_ffmpeg_crc $file $3 -i $file
-
+ do_md5sum ${outfile}libav02.$1 >> $logfile
}
do_audio_only()
###################################
# generate reference for quality check
do_ffmpeg_nocheck $raw_ref -y -f pgmyuv -i $raw_src -an -f rawvideo $raw_ref
-do_ffmpeg_nocheck $pcm_ref -y -ab 128 -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav $pcm_ref
+do_ffmpeg_nocheck $pcm_ref -y -ab 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav $pcm_ref
###################################
if [ -n "$do_mpeg" ] ; then
do_video_decoding
# mpeg2 encoding intra vlc qprd
-do_video_encoding mpeg2ivlc-qprd.mpg "-b 500k -bf 2 -flags +trell+qprd+mv0 -flags2 +ivlc -cmp 2 -subcmp 2 -mbd rd" pgmyuv "-vcodec mpeg2video -f mpeg2video"
+do_video_encoding mpeg2ivlc-qprd.mpg "-vb 500k -bf 2 -flags +trell+qprd+mv0 -flags2 +ivlc -cmp 2 -subcmp 2 -mbd rd" pgmyuv "-vcodec mpeg2video -f mpeg2video"
# mpeg2 decoding
do_video_decoding
###################################
if [ -n "$do_mp4psp" ] ; then
# mp4 PSP style
-do_video_encoding mpeg4-PSP.mp4 "-b 768k -s 320x240" psp "-ar 24000 -ab 32 -i $raw_src"
+do_video_encoding mpeg4-PSP.mp4 "-vb 768k -s 320x240" psp "-ar 24000 -ab 32k -i $raw_src"
fi
###################################
###################################
if [ -n "$do_g726" ] ; then
# g726
-do_audio_encoding g726.wav "-ar 44100" "-ab 32 -ac 1 -ar 8000 -acodec g726"
+do_audio_encoding g726.wav "-ar 44100" "-ab 32k -ac 1 -ar 8000 -acodec g726"
do_audio_decoding
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
+###################################
+#if [ -n "$do_vorbis" ] ; then
+# vorbis
+#disabled because its broken
+#do_audio_encoding vorbis.asf "-ar 44100" "-acodec vorbis"
+#do_audio_decoding
+#fi
###################################
# libavformat testing
####################
# image formats
-# pgm (we do not do md5 on image files yet)
+# pgm
do_image_formats pgm
-# ppm (we do not do md5 on image files yet)
+# ppm
do_image_formats ppm
-# jpeg (we do not do md5 on image files yet)
+# bmp
+do_image_formats bmp
+
+# tga
+do_image_formats tga
+
+# tiff
+do_image_formats tiff "-pix_fmt rgb24"
+
+# sgi
+do_image_formats sgi
+
+# jpeg
do_image_formats jpg "-flags +bitexact -dct fastint -idct simple -pix_fmt yuvj420p" "-f image2"
####################
####################
# pix_fmt conversions
-conversions="yuv420p yuv422p yuv444p yuv422 yuv410p yuv411p yuvj420p \
- yuvj422p yuvj444p rgb24 bgr24 rgba32 rgb565 rgb555 gray monow \
+conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
+ yuvj422p yuvj444p rgb24 bgr24 rgb32 rgb565 rgb555 gray monow \
monob pal8"
for pix_fmt in $conversions ; do
file=${outfile}libav-${pix_fmt}.yuv