Browse Source

fate: simplify regression-funcs.sh

Factor ffmpeg calls using run_ffmpeg()
Luca Barbato 14 years ago
parent
commit
a96c176aed
1 changed files with 4 additions and 8 deletions
  1. 4 8
      tests/regression-funcs.sh

+ 4 - 8
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
 }