RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert broken removal of variable indirection. 

Originally committed as revision 7532 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-01-15 07:56:15 +00:00
parent e950141a58
commit 9e32e071e1
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/regression.sh
View File

@ -116,42 +116,45 @@ FFMPEG_OPTS="-y -flags +bitexact -dct fastint -idct simple"
do_ffmpeg() do_ffmpeg()
{ {
f="$1"
shift shift
echo $ffmpeg $FFMPEG_OPTS $* echo $ffmpeg $FFMPEG_OPTS $*
$ffmpeg $FFMPEG_OPTS -benchmark $* > $bench 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 $1 >> $logfile do_md5sum $f >> $logfile
if [ $1 = $raw_dst ] ; then if [ $f = $raw_dst ] ; then
$tiny_psnr $1 $raw_ref >> $logfile $tiny_psnr $f $raw_ref >> $logfile
elif [ $1 = $pcm_dst ] ; then elif [ $f = $pcm_dst ] ; then
$tiny_psnr $1 $pcm_ref 2 >> $logfile $tiny_psnr $f $pcm_ref 2 >> $logfile
else else
wc -c $1 >> $logfile wc -c $f >> $logfile
fi fi
expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2 expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2
echo `cat $bench2` $1 >> $benchfile echo `cat $bench2` $f >> $benchfile
} }
do_ffmpeg_crc() do_ffmpeg_crc()
{ {
f="$1"
shift shift
echo $ffmpeg $FFMPEG_OPTS $* -f crc $datadir/ffmpeg.crc echo $ffmpeg $FFMPEG_OPTS $* -f crc $datadir/ffmpeg.crc
$ffmpeg $FFMPEG_OPTS $* -f crc $datadir/ffmpeg.crc > /tmp/ffmpeg$$ 2>&1 $ffmpeg $FFMPEG_OPTS $* -f crc $datadir/ffmpeg.crc > /tmp/ffmpeg$$ 2>&1
egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:|ffmpeg version| configuration| built)" /tmp/ffmpeg$$ || true egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:|ffmpeg version| configuration| built)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$ rm -f /tmp/ffmpeg$$
echo "$1 `cat $datadir/ffmpeg.crc`" >> $logfile echo "$f `cat $datadir/ffmpeg.crc`" >> $logfile
} }
do_ffmpeg_nocheck() do_ffmpeg_nocheck()
{ {
f="$1"
shift shift
echo $ffmpeg $FFMPEG_OPTS $* echo $ffmpeg $FFMPEG_OPTS $*
$ffmpeg $FFMPEG_OPTS -benchmark $* > $bench 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 $bench`" : '.*utime=\(.*s\)' > $bench2 expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2
echo `cat $bench2` $1 >> $benchfile echo `cat $bench2` $f >> $benchfile
} }
do_video_decoding() do_video_decoding()