Revision 8deb894f

View differences:

tests/regression.sh
93 93
tiny_psnr="./tiny_psnr"
94 94
reffile="$2"
95 95
benchfile="$datadir/ffmpeg.bench"
96
bench="$datadir/bench.tmp"
97
bench2="$datadir/bench2.tmp"
96 98
raw_src="$3/%02d.pgm"
97 99
raw_dst="$datadir/out.yuv"
98 100
raw_ref="$datadir/ref.yuv"
......
117 119
    f="$1"
118 120
    shift
119 121
    echo $ffmpeg $FFMPEG_OPTS $*
120
    $ffmpeg $FFMPEG_OPTS -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$
122
    $ffmpeg $FFMPEG_OPTS -benchmark $* > $bench 2> /tmp/ffmpeg$$
121 123
    egrep -v "^(Stream|Press|Input|Output|frame|  Stream|  Duration|video:)" /tmp/ffmpeg$$ || true
122 124
    rm -f /tmp/ffmpeg$$
123 125
    do_md5sum $f >> $logfile
......
128 130
    else
129 131
        wc -c $f >> $logfile
130 132
    fi
131
    expr "`cat $datadir/bench.tmp`" : '.*utime=\(.*s\)' > $datadir/bench2.tmp
132
    echo `cat $datadir/bench2.tmp` $f >> $benchfile
133
    expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2
134
    echo `cat $bench2` $f >> $benchfile
133 135
}
134 136

  
135 137
do_ffmpeg_crc()
......
148 150
    f="$1"
149 151
    shift
150 152
    echo $ffmpeg $FFMPEG_OPTS $*
151
    $ffmpeg $FFMPEG_OPTS -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$
153
    $ffmpeg $FFMPEG_OPTS -benchmark $* > $bench 2> /tmp/ffmpeg$$
152 154
    egrep -v "^(Stream|Press|Input|Output|frame|  Stream|  Duration|video:)" /tmp/ffmpeg$$ || true
153 155
    rm -f /tmp/ffmpeg$$
154
    expr "`cat $datadir/bench.tmp`" : '.*utime=\(.*s\)' > $datadir/bench2.tmp
155
    echo `cat $datadir/bench2.tmp` $f >> $benchfile
156
    expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2
157
    echo `cat $bench2` $f >> $benchfile
156 158
}
157 159

  
158 160
do_video_decoding()

Also available in: Unified diff