Commit 8deb894f authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Add two more variables for temporary files.

Originally committed as revision 7512 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent d9c211ee
...@@ -93,6 +93,8 @@ ffmpeg="../ffmpeg_g" ...@@ -93,6 +93,8 @@ ffmpeg="../ffmpeg_g"
tiny_psnr="./tiny_psnr" tiny_psnr="./tiny_psnr"
reffile="$2" reffile="$2"
benchfile="$datadir/ffmpeg.bench" benchfile="$datadir/ffmpeg.bench"
bench="$datadir/bench.tmp"
bench2="$datadir/bench2.tmp"
raw_src="$3/%02d.pgm" raw_src="$3/%02d.pgm"
raw_dst="$datadir/out.yuv" raw_dst="$datadir/out.yuv"
raw_ref="$datadir/ref.yuv" raw_ref="$datadir/ref.yuv"
...@@ -117,7 +119,7 @@ do_ffmpeg() ...@@ -117,7 +119,7 @@ do_ffmpeg()
f="$1" f="$1"
shift shift
echo $ffmpeg $FFMPEG_OPTS $* 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 egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$ rm -f /tmp/ffmpeg$$
do_md5sum $f >> $logfile do_md5sum $f >> $logfile
...@@ -128,8 +130,8 @@ do_ffmpeg() ...@@ -128,8 +130,8 @@ do_ffmpeg()
else else
wc -c $f >> $logfile wc -c $f >> $logfile
fi fi
expr "`cat $datadir/bench.tmp`" : '.*utime=\(.*s\)' > $datadir/bench2.tmp expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2
echo `cat $datadir/bench2.tmp` $f >> $benchfile echo `cat $bench2` $f >> $benchfile
} }
do_ffmpeg_crc() do_ffmpeg_crc()
...@@ -148,11 +150,11 @@ do_ffmpeg_nocheck() ...@@ -148,11 +150,11 @@ do_ffmpeg_nocheck()
f="$1" f="$1"
shift shift
echo $ffmpeg $FFMPEG_OPTS $* 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 egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$ rm -f /tmp/ffmpeg$$
expr "`cat $datadir/bench.tmp`" : '.*utime=\(.*s\)' > $datadir/bench2.tmp expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2
echo `cat $datadir/bench2.tmp` $f >> $benchfile echo `cat $bench2` $f >> $benchfile
} }
do_video_decoding() do_video_decoding()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment