From a96c176aed2ef7924941d690d6c3107ffe35c4cd Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Tue, 22 Mar 2011 00:13:48 +0100 Subject: fate: simplify regression-funcs.sh Factor ffmpeg calls using run_ffmpeg() --- tests/regression-funcs.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'tests/regression-funcs.sh') diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index 148a255556..4093656736 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -66,8 +66,7 @@ do_ffmpeg() f="$1" shift set -- $* ${target_path}/$f - $echov $ffmpeg $FFMPEG_OPTS $* - $ffmpeg $FFMPEG_OPTS -benchmark $* > $bench + run_ffmpeg -benchmark $* > $bench do_md5sum $f >> $logfile if [ $f = $raw_dst ] ; then $tiny_psnr $f $raw_ref >> $logfile @@ -85,8 +84,7 @@ do_ffmpeg_nomd5() f="$1" shift set -- $* ${target_path}/$f - $echov $ffmpeg $FFMPEG_OPTS $* - $ffmpeg $FFMPEG_OPTS -benchmark $* > $bench + run_ffmpeg -benchmark $* > $bench if [ $f = $raw_dst ] ; then $tiny_psnr $f $raw_ref >> $logfile elif [ $f = $pcm_dst ] ; then @@ -102,8 +100,7 @@ do_ffmpeg_crc() { f="$1" shift - $echov $ffmpeg $FFMPEG_OPTS $* -f crc "$target_crcfile" - $ffmpeg $FFMPEG_OPTS $* -f crc "$target_crcfile" + run_ffmpeg $* -f crc "$target_crcfile" echo "$f $(cat $crcfile)" >> $logfile } @@ -111,8 +108,7 @@ do_ffmpeg_nocheck() { f="$1" shift - $echov $ffmpeg $FFMPEG_OPTS $* - $ffmpeg $FFMPEG_OPTS -benchmark $* > $bench + run_ffmpeg -benchmark $* > $bench expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2 echo $(cat $bench2) $f >> $benchfile } -- cgit v1.2.3