summaryrefslogtreecommitdiff
path: root/contrib/ffmpeg/tests/regression.sh
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ffmpeg/tests/regression.sh')
-rwxr-xr-xcontrib/ffmpeg/tests/regression.sh367
1 files changed, 152 insertions, 215 deletions
diff --git a/contrib/ffmpeg/tests/regression.sh b/contrib/ffmpeg/tests/regression.sh
index 70f4eba12..c4c2f776b 100755
--- a/contrib/ffmpeg/tests/regression.sh
+++ b/contrib/ffmpeg/tests/regression.sh
@@ -4,7 +4,7 @@
#
#
#set -x
-# Even in the 21st century some diffs are not supporting -u.
+# Even in the 21st century some diffs do not support -u.
diff -u "$0" "$0" > /dev/null 2>&1
if [ $? -eq 0 ]; then
diff_cmd="diff -u"
@@ -24,7 +24,7 @@ datadir="./data"
logfile="$datadir/ffmpeg.regression"
outfile="$datadir/a-"
-# tests to do
+# tests to run
if [ "$1" = "mpeg4" ] ; then
do_mpeg4=y
elif [ "$1" = "mpeg" ] ; then
@@ -41,7 +41,7 @@ elif [ "$1" = "snow" ] ; then
elif [ "$1" = "snowll" ] ; then
do_snowll=y
elif [ "$1" = "libavtest" ] ; then
- do_libav=y
+ do_libavtest=y
logfile="$datadir/libav.regression"
outfile="$datadir/b-"
else
@@ -69,6 +69,8 @@ else
do_adpcm_ima_wav=y
do_adpcm_ms=y
do_flac=y
+ do_wma=y
+ do_vorbis=y
do_rc=y
do_mpeg4adv=y
do_mpeg4thread=y
@@ -93,6 +95,8 @@ ffmpeg="../ffmpeg_g"
tiny_psnr="./tiny_psnr"
reffile="$2"
benchfile="$datadir/ffmpeg.bench"
+bench="$datadir/bench.tmp"
+bench2="$datadir/bench2.tmp"
raw_src="$3/%02d.pgm"
raw_dst="$datadir/out.yuv"
raw_ref="$datadir/ref.yuv"
@@ -107,7 +111,7 @@ else
do_md5sum() { echo No md5sum program found; }
fi
-# create the data directory if it does not exists
+# create the data directory if it does not exist
mkdir -p $datadir
FFMPEG_OPTS="-y -flags +bitexact -dct fastint -idct simple"
@@ -117,7 +121,7 @@ do_ffmpeg()
f="$1"
shift
echo $ffmpeg $FFMPEG_OPTS $*
- $ffmpeg $FFMPEG_OPTS -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$
+ $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$$
do_md5sum $f >> $logfile
@@ -128,8 +132,27 @@ do_ffmpeg()
else
wc -c $f >> $logfile
fi
- expr "`cat $datadir/bench.tmp`" : '.*utime=\(.*s\)' > $datadir/bench2.tmp
- echo `cat $datadir/bench2.tmp` $f >> $benchfile
+ expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2
+ 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()
@@ -148,27 +171,28 @@ do_ffmpeg_nocheck()
f="$1"
shift
echo $ffmpeg $FFMPEG_OPTS $*
- $ffmpeg $FFMPEG_OPTS -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$
+ $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$$
- expr "`cat $datadir/bench.tmp`" : '.*utime=\(.*s\)' > $datadir/bench2.tmp
- echo `cat $datadir/bench2.tmp` $f >> $benchfile
+ expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2
+ echo `cat $bench2` $f >> $benchfile
}
do_video_decoding()
{
- do_ffmpeg $raw_dst -y -i $file -f rawvideo $@ $raw_dst
+ do_ffmpeg $raw_dst -y $1 -i $file -f rawvideo $2 $raw_dst
}
do_video_encoding()
{
- do_ffmpeg $file -y $1 -f pgmyuv -i $raw_src $2 $file
+ file=${outfile}$1
+ do_ffmpeg $file -y $2 -f $3 -i $raw_src $4 $file
}
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()
@@ -196,7 +220,7 @@ do_image_formats()
file=${outfile}libav%02d.$1
$ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $2 $3 $file
do_ffmpeg_crc $file $3 -i $file
-
+ do_md5sum ${outfile}libav02.$1 >> $logfile
}
do_audio_only()
@@ -212,44 +236,33 @@ echo "ffmpeg benchmarks" > $benchfile
###################################
# 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
-# mpeg1 encoding
-file=${outfile}mpeg1.mpg
-do_video_encoding "-qscale 10" "-f mpeg1video"
-
-# mpeg1 decoding
+# mpeg1
+do_video_encoding mpeg1.mpg "-qscale 10" pgmyuv "-f mpeg1video"
do_video_decoding
fi
###################################
if [ -n "$do_mpeg2" ] ; then
-# mpeg2 encoding
-file=${outfile}mpeg2.mpg
-do_video_encoding "-qscale 10" "-vcodec mpeg2video -f mpeg1video"
-
-# mpeg2 decoding
+# mpeg2
+do_video_encoding mpeg2.mpg "-qscale 10" pgmyuv "-vcodec mpeg2video -f mpeg1video"
do_video_decoding
-# mpeg2 encoding using intra vlc
-file=${outfile}mpeg2ivlc.mpg
-do_video_encoding "-qscale 10" "-vcodec mpeg2video -f mpeg1video -flags2 +ivlc"
+# mpeg2 encoding intra vlc qprd
+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
-# mpeg2 encoding
-file=${outfile}mpeg2.mpg
-do_video_encoding "-qscale 10" "-vcodec mpeg2video -idct int -dct int -f mpeg1video"
-
-# mpeg2 decoding
-do_ffmpeg $raw_dst -y -idct int -i $file -f rawvideo $raw_dst
+# mpeg2
+do_video_encoding mpeg2.mpg "-qscale 10" pgmyuv "-vcodec mpeg2video -idct int -dct int -f mpeg1video"
+do_video_decoding "-idct int"
# mpeg2 encoding interlaced
-file=${outfile}mpeg2i.mpg
-do_video_encoding "-qscale 10" "-vcodec mpeg2video -f mpeg1video -flags +ildct+ilme"
+do_video_encoding mpeg2i.mpg "-qscale 10" pgmyuv "-vcodec mpeg2video -f mpeg1video -flags +ildct+ilme"
# mpeg2 decoding
do_video_decoding
@@ -258,15 +271,13 @@ fi
###################################
if [ -n "$do_mpeg2thread" ] ; then
# mpeg2 encoding interlaced
-file=${outfile}mpeg2thread.mpg
-do_video_encoding "-qscale 10" "-vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 2"
+do_video_encoding mpeg2thread.mpg "-qscale 10" pgmyuv "-vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 2"
# mpeg2 decoding
do_video_decoding
# mpeg2 encoding interlaced using intra vlc
-file=${outfile}mpeg2threadivlc.mpg
-do_video_encoding "-qscale 10" "-vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -flags2 +ivlc -threads 2"
+do_video_encoding mpeg2threadivlc.mpg "-qscale 10" pgmyuv "-vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -flags2 +ivlc -threads 2"
# mpeg2 decoding
do_video_decoding
@@ -281,381 +292,301 @@ fi
###################################
if [ -n "$do_msmpeg4v2" ] ; then
-# msmpeg4 encoding
-file=${outfile}msmpeg4v2.avi
-do_video_encoding "-qscale 10" "-an -vcodec msmpeg4v2"
-
-# msmpeg4v2 decoding
+# msmpeg4
+do_video_encoding msmpeg4v2.avi "-qscale 10" pgmyuv "-an -vcodec msmpeg4v2"
do_video_decoding
fi
###################################
if [ -n "$do_msmpeg4" ] ; then
-# msmpeg4 encoding
-file=${outfile}msmpeg4.avi
-do_video_encoding "-qscale 10" "-an -vcodec msmpeg4"
-
-# msmpeg4 decoding
+# msmpeg4
+do_video_encoding msmpeg4.avi "-qscale 10" pgmyuv "-an -vcodec msmpeg4"
do_video_decoding
fi
###################################
if [ -n "$do_wmv1" ] ; then
-# wmv1 encoding
-file=${outfile}wmv1.avi
-do_video_encoding "-qscale 10" "-an -vcodec wmv1"
-
-# wmv1 decoding
+# wmv1
+do_video_encoding wmv1.avi "-qscale 10" pgmyuv "-an -vcodec wmv1"
do_video_decoding
fi
###################################
if [ -n "$do_wmv2" ] ; then
-# wmv2 encoding
-file=${outfile}wmv2.avi
-do_video_encoding "-qscale 10" "-an -vcodec wmv2"
-
-# wmv2 decoding
+# wmv2
+do_video_encoding wmv2.avi "-qscale 10" pgmyuv "-an -vcodec wmv2"
do_video_decoding
fi
###################################
if [ -n "$do_h261" ] ; then
-# h261 encoding
-file=${outfile}h261.avi
-do_video_encoding "-qscale 11" "-s 352x288 -an -vcodec h261"
-
-# h261 decoding
+# h261
+do_video_encoding h261.avi "-qscale 11" pgmyuv "-s 352x288 -an -vcodec h261"
do_video_decoding
fi
###################################
if [ -n "$do_h263" ] ; then
-# h263 encoding
-file=${outfile}h263.avi
-do_video_encoding "-qscale 10" "-s 352x288 -an -vcodec h263"
-
-# h263 decoding
+# h263
+do_video_encoding h263.avi "-qscale 10" pgmyuv "-s 352x288 -an -vcodec h263"
do_video_decoding
fi
###################################
if [ -n "$do_h263p" ] ; then
-# h263p encoding
-file=${outfile}h263p.avi
-do_video_encoding "-qscale 2 -flags +umv+aiv+aic" "-s 352x288 -an -vcodec h263p -ps 300"
-
-# h263p decoding
+# h263p
+do_video_encoding h263p.avi "-qscale 2 -flags +umv+aiv+aic" pgmyuv "-s 352x288 -an -vcodec h263p -ps 300"
do_video_decoding
fi
###################################
if [ -n "$do_mpeg4" ] ; then
# mpeg4
-file=${outfile}odivx.mp4
-do_video_encoding "-flags +mv4 -mbd bits -qscale 10" "-an -vcodec mpeg4"
-
-# mpeg4 decoding
+do_video_encoding odivx.mp4 "-flags +mv4 -mbd bits -qscale 10" pgmyuv "-an -vcodec mpeg4"
do_video_decoding
fi
###################################
if [ -n "$do_huffyuv" ] ; then
# huffyuv
-file=${outfile}huffyuv.avi
-do_video_encoding "" "-an -vcodec huffyuv -pix_fmt yuv422p"
-
-# huffyuv decoding
-do_video_decoding -strict -2 -pix_fmt yuv420p
+do_video_encoding huffyuv.avi "" pgmyuv "-an -vcodec huffyuv -pix_fmt yuv422p"
+do_video_decoding "" "-strict -2 -pix_fmt yuv420p"
fi
###################################
if [ -n "$do_rc" ] ; then
# mpeg4 rate control
-file=${outfile}mpeg4-rc.avi
-do_video_encoding "-b 400k -bf 2" "-an -vcodec mpeg4"
-
-# mpeg4 rate control decoding
+do_video_encoding mpeg4-rc.avi "-b 400k -bf 2" pgmyuv "-an -vcodec mpeg4"
do_video_decoding
fi
###################################
if [ -n "$do_mpeg4adv" ] ; then
# mpeg4
-file=${outfile}mpeg4-adv.avi
-do_video_encoding "-qscale 9 -flags +mv4+part+aic+trell -mbd bits -ps 200" "-an -vcodec mpeg4"
+do_video_encoding mpeg4-adv.avi "-qscale 9 -flags +mv4+part+aic+trell -mbd bits -ps 200" pgmyuv "-an -vcodec mpeg4"
+do_video_decoding
-# mpeg4 decoding
+# mpeg4
+do_video_encoding mpeg4-qprd.avi "-b 450k -bf 2 -flags +mv4+trell+qprd+mv0 -cmp 2 -subcmp 2 -mbd rd" pgmyuv "-an -vcodec mpeg4"
do_video_decoding
-fi
-###################################
-if [ -n "$do_mpeg4thread" ] ; then
# mpeg4
-file=${outfile}mpeg4-thread.avi
-do_video_encoding "-b 500k -flags +mv4+part+aic+trell -mbd bits -ps 200 -bf 2" "-an -vcodec mpeg4 -threads 2"
+do_video_encoding mpeg4-adap.avi "-b 550k -bf 2 -flags +mv4+trell+mv0 -cmp 1 -subcmp 2 -mbd rd -scplx_mask 0.3" pgmyuv "-an -vcodec mpeg4"
+do_video_decoding
-# mpeg4 decoding
+# mpeg4
+do_video_encoding mpeg4-Q.avi "-qscale 7 -flags +mv4+qpel -mbd 2 -bf 2 -cmp 1 -subcmp 2" pgmyuv "-an -vcodec mpeg4"
do_video_decoding
fi
###################################
-if [ -n "$do_mpeg4adv" ] ; then
+if [ -n "$do_mpeg4thread" ] ; then
# mpeg4
-file=${outfile}mpeg4-Q.avi
-do_video_encoding "-qscale 7 -flags +mv4+qpel -mbd 2 -bf 2 -cmp 1 -subcmp 2" "-an -vcodec mpeg4"
-
-# mpeg4 decoding
+do_video_encoding mpeg4-thread.avi "-b 500k -flags +mv4+part+aic+trell -mbd bits -ps 200 -bf 2" pgmyuv "-an -vcodec mpeg4 -threads 2"
do_video_decoding
fi
###################################
if [ -n "$do_mp4psp" ] ; then
# mp4 PSP style
-file=${outfile}mpeg4-PSP.mp4
-do_ffmpeg $file -y -b 768k -s 320x240 -f psp -ar 24000 -ab 32 -i $raw_src $file
+do_video_encoding mpeg4-PSP.mp4 "-vb 768k -s 320x240" psp "-ar 24000 -ab 32k -i $raw_src"
fi
###################################
if [ -n "$do_error" ] ; then
# damaged mpeg4
-file=${outfile}error-mpeg4-adv.avi
-do_video_encoding "-qscale 7 -flags +mv4+part+aic -mbd rd -ps 250 -error 10" "-an -vcodec mpeg4"
-
-# damaged mpeg4 decoding
+do_video_encoding error-mpeg4-adv.avi "-qscale 7 -flags +mv4+part+aic -mbd rd -ps 250 -error 10" pgmyuv "-an -vcodec mpeg4"
do_video_decoding
fi
###################################
if [ -n "$do_mpeg4nr" ] ; then
# noise reduction
-file=${outfile}mpeg4-nr.avi
-do_video_encoding "-qscale 8 -flags +mv4 -mbd rd -nr 200" "-an -vcodec mpeg4"
-
-# mpeg4 decoding
+do_video_encoding mpeg4-nr.avi "-qscale 8 -flags +mv4 -mbd rd -nr 200" pgmyuv "-an -vcodec mpeg4"
do_video_decoding
fi
###################################
if [ -n "$do_mpeg1b" ] ; then
# mpeg1
-file=${outfile}mpeg1b.mpg
-do_video_encoding "-qscale 8 -bf 3 -ps 200" "-an -vcodec mpeg1video -f mpeg1video"
-
-# mpeg1 decoding
+do_video_encoding mpeg1b.mpg "-qscale 8 -bf 3 -ps 200" pgmyuv "-an -vcodec mpeg1video -f mpeg1video"
do_video_decoding
fi
###################################
if [ -n "$do_mjpeg" ] ; then
# mjpeg
-file=${outfile}mjpeg.avi
-do_video_encoding "-qscale 10" "-an -vcodec mjpeg -pix_fmt yuvj420p"
-
-# mjpeg decoding
-do_video_decoding -pix_fmt yuv420p
+do_video_encoding mjpeg.avi "-qscale 10" pgmyuv "-an -vcodec mjpeg -pix_fmt yuvj420p"
+do_video_decoding "" "-pix_fmt yuv420p"
fi
###################################
if [ -n "$do_ljpeg" ] ; then
# ljpeg
-file=${outfile}ljpeg.avi
-do_video_encoding "" "-an -vcodec ljpeg -strict -1"
-
-# ljpeg decoding
+do_video_encoding ljpeg.avi "" pgmyuv "-an -vcodec ljpeg -strict -1"
do_video_decoding
fi
###################################
if [ -n "$do_jpegls" ] ; then
# jpeg ls
-file=${outfile}jpegls.avi
-do_video_encoding "" "-an -vcodec jpegls -vtag MJPG"
-
-# jpeg ls decoding
-do_video_decoding -pix_fmt yuv420p
+do_video_encoding jpegls.avi "" pgmyuv "-an -vcodec jpegls -vtag MJPG"
+do_video_decoding "" "-pix_fmt yuv420p"
fi
###################################
if [ -n "$do_rv10" ] ; then
# rv10 encoding
-file=${outfile}rv10.rm
-do_video_encoding "-qscale 10" "-an"
-
-# rv10 decoding
+do_video_encoding rv10.rm "-qscale 10" pgmyuv "-an"
do_video_decoding
fi
###################################
if [ -n "$do_rv20" ] ; then
# rv20 encoding
-file=${outfile}rv20.rm
-do_video_encoding "-qscale 10" "-vcodec rv20 -an"
-
-# rv20 decoding
+do_video_encoding rv20.rm "-qscale 10" pgmyuv "-vcodec rv20 -an"
do_video_decoding
fi
###################################
if [ -n "$do_asv1" ] ; then
# asv1 encoding
-file=${outfile}asv1.avi
-do_video_encoding "-qscale 10" "-an -vcodec asv1"
-
-# asv1 decoding
+do_video_encoding asv1.avi "-qscale 10" pgmyuv "-an -vcodec asv1"
do_video_decoding
fi
###################################
if [ -n "$do_asv2" ] ; then
# asv2 encoding
-file=${outfile}asv2.avi
-do_video_encoding "-qscale 10" "-an -vcodec asv2"
-
-# asv2 decoding
+do_video_encoding asv2.avi "-qscale 10" pgmyuv "-an -vcodec asv2"
do_video_decoding
fi
###################################
if [ -n "$do_flv" ] ; then
# flv encoding
-file=${outfile}flv.flv
-do_video_encoding "-qscale 10" "-an -vcodec flv"
-
-# flv decoding
+do_video_encoding flv.flv "-qscale 10" pgmyuv "-an -vcodec flv"
do_video_decoding
fi
###################################
if [ -n "$do_ffv1" ] ; then
# ffv1 encoding
-file=${outfile}ffv1.avi
-do_video_encoding "-strict -2" "-an -vcodec ffv1"
-
-# ffv1 decoding
+do_video_encoding ffv1.avi "-strict -2" pgmyuv "-an -vcodec ffv1"
do_video_decoding
fi
###################################
if [ -n "$do_snow" ] ; then
-# snow encoding
-file=${outfile}snow.avi
-do_video_encoding "-strict -2" "-an -vcodec snow -qscale 2 -flags +qpel -me iter -dia_size 2 -cmp 12 -subcmp 12 -s 128x64"
-
-# snow decoding
-do_video_decoding -s 352x288
+# snow
+do_video_encoding snow.avi "-strict -2" pgmyuv "-an -vcodec snow -qscale 2 -flags +qpel -me iter -dia_size 2 -cmp 12 -subcmp 12 -s 128x64"
+do_video_decoding "" "-s 352x288"
fi
###################################
if [ -n "$do_snowll" ] ; then
-# snow encoding
-file=${outfile}snow53.avi
-do_video_encoding "-strict -2" "-an -vcodec snow -qscale .001 -pred 1 -flags +mv4+qpel"
-
-# snow decoding
+# snow
+do_video_encoding snow53.avi "-strict -2" pgmyuv "-an -vcodec snow -qscale .001 -pred 1 -flags +mv4+qpel"
do_video_decoding
fi
###################################
if [ -n "$do_dv" ] ; then
-# dv encoding
-file=${outfile}dv.dv
-do_video_encoding "-dct int" "-s pal -an"
-
-# dv decoding
-do_video_decoding -s cif
+# dv
+do_video_encoding dv.dv "-dct int" pgmyuv "-s pal -an"
+do_video_decoding "" "-s cif"
fi
###################################
if [ -n "$do_dv50" ] ; then
-# dv50 encoding
-file=${outfile}dv.dv
-do_video_encoding "-dct int" "-s pal -pix_fmt yuv422p -an"
-
-# dv50 decoding
-do_video_decoding -s cif -pix_fmt yuv420p
+# dv50
+do_video_encoding dv.dv "-dct int" pgmyuv "-s pal -pix_fmt yuv422p -an"
+do_video_decoding "" "-s cif -pix_fmt yuv420p"
fi
###################################
if [ -n "$do_svq1" ] ; then
-# svq1 encoding
-file=${outfile}svq1.mov
-do_video_encoding "" "-an -vcodec svq1 -qscale 3 -pix_fmt yuv410p"
-
-# svq1 decoding
-do_video_decoding -pix_fmt yuv420p
+# svq1
+do_video_encoding svq1.mov "" pgmyuv "-an -vcodec svq1 -qscale 3 -pix_fmt yuv410p"
+do_video_decoding "" "-pix_fmt yuv420p"
fi
###################################
if [ -n "$do_mp2" ] ; then
-# mp2 encoding
+# mp2
do_audio_encoding mp2.mp2 "-ar 44100"
-
-# mp2 decoding
do_audio_decoding
$tiny_psnr $pcm_dst $pcm_ref 2 1924 >> $logfile
fi
###################################
if [ -n "$do_ac3" ] ; then
-# ac3 encoding
+# ac3
do_audio_encoding ac3.rm "" -vn
-
-# ac3 decoding
#do_audio_decoding
fi
###################################
if [ -n "$do_g726" ] ; then
-# g726 encoding
-do_audio_encoding g726.wav "-ar 44100" "-ab 32 -ac 1 -ar 8000 -acodec g726"
-
-# g726 decoding
+# g726
+do_audio_encoding g726.wav "-ar 44100" "-ab 32k -ac 1 -ar 8000 -acodec g726"
do_audio_decoding
fi
###################################
if [ -n "$do_adpcm_ima_wav" ] ; then
-# encoding
+# adpcm ima
do_audio_encoding adpcm_ima.wav "-ar 44100" "-acodec adpcm_ima_wav"
-
-# decoding
do_audio_decoding
fi
###################################
if [ -n "$do_adpcm_ms" ] ; then
-# encoding
+# adpcm ms
do_audio_encoding adpcm_ms.wav "-ar 44100" "-acodec adpcm_ms"
-
-# decoding
do_audio_decoding
fi
###################################
if [ -n "$do_adpcm_yam" ] ; then
-# encoding
+# adpcm yamaha
do_audio_encoding adpcm_yam.wav "-ar 44100" "-acodec adpcm_yamaha"
-
-# decoding
do_audio_decoding
fi
###################################
if [ -n "$do_flac" ] ; then
-# encoding
+# flac
do_audio_encoding flac.flac "-ar 44100" "-acodec flac -compression_level 2"
-
-# decoding
do_audio_decoding
fi
###################################
-# libav testing
+if [ -n "$do_wma" ] ; then
+# wmav1
+do_audio_encoding wmav1.asf "-ar 44100" "-acodec wmav1"
+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_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
-if [ -n "$do_libav" ] ; then
+###################################
+# libavformat testing
+###################################
+
+if [ -n "$do_libavtest" ] ; then
# avi
do_libav avi
@@ -675,8 +606,8 @@ do_libav mpg
# mpegts
do_libav ts
-# swf (decode audio only)
-do_libav swf "-acodec mp2"
+# swf
+do_libav swf -an
# ffm
do_libav ffm
@@ -724,13 +655,19 @@ do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src $file
####################
# 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
+
+# jpeg
do_image_formats jpg "-flags +bitexact -dct fastint -idct simple -pix_fmt yuvj420p" "-f image2"
####################
@@ -759,8 +696,8 @@ do_audio_only voc
####################
# 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
@@ -770,7 +707,7 @@ for pix_fmt in $conversions ; do
-f rawvideo -s 352x288 -pix_fmt yuv444p $file
done
-fi
+fi # [ -n "$do_libavtest" ]