Revision d9076fe7

View differences:

tests/ffmpeg.regression.ref
190 190
stddev: 33.31 PSNR:65.87 bytes:1040384
191 191
a2176602cfebad51f5688f793ab5d59a *./data/a-wmav1.asf
192 192
99596 ./data/a-wmav1.asf
193
2ab193df22bb473e61015e56ac11faf3 *./data/out.wav
194 193
stddev:12251.50 PSNR:14.56 bytes:1056768
195 194
stddev:2106.00 PSNR:29.85 bytes:1048576
196 195
df1c902a4518a06afed977a8a74a60c9 *./data/a-wmav2.asf
197 196
99602 ./data/a-wmav2.asf
198
8d05d345bc14153f3d0da95fdf34e084 *./data/out.wav
199 197
stddev:12255.92 PSNR:14.55 bytes:1056768
200 198
stddev:2099.31 PSNR:29.88 bytes:1048576
tests/regression.sh
136 136
    echo `cat $bench2` $f >> $benchfile
137 137
}
138 138

  
139
do_ffmpeg_nomd5()
140
{
141
    f="$1"
142
    shift
143
    echo $ffmpeg $FFMPEG_OPTS $*
144
    $ffmpeg $FFMPEG_OPTS -benchmark $* > $bench 2> /tmp/ffmpeg$$
145
    egrep -v "^(Stream|Press|Input|Output|frame|  Stream|  Duration|video:)" /tmp/ffmpeg$$ || true
146
    rm -f /tmp/ffmpeg$$
147
    if [ $f = $raw_dst ] ; then
148
        $tiny_psnr $f $raw_ref >> $logfile
149
    elif [ $f = $pcm_dst ] ; then
150
        $tiny_psnr $f $pcm_ref 2 >> $logfile
151
    else
152
        wc -c $f >> $logfile
153
    fi
154
    expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2
155
    echo `cat $bench2` $f >> $benchfile
156
}
157

  
139 158
do_ffmpeg_crc()
140 159
{
141 160
    f="$1"
......
547 566
if [ -n "$do_wma" ] ; then
548 567
# wmav1
549 568
do_audio_encoding wmav1.asf "-ar 44100" "-acodec wmav1"
550
do_audio_decoding
569
do_ffmpeg_nomd5 $pcm_dst -y -i $file -f wav $pcm_dst
551 570
$tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile
552 571
# wmav2
553 572
do_audio_encoding wmav2.asf "-ar 44100" "-acodec wmav2"
554
do_audio_decoding
573
do_ffmpeg_nomd5 $pcm_dst -y -i $file -f wav $pcm_dst
555 574
$tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile
556 575
fi
557 576

  
tests/rotozoom.regression.ref
190 190
stddev: 33.31 PSNR:65.87 bytes:1040384
191 191
a2176602cfebad51f5688f793ab5d59a *./data/a-wmav1.asf
192 192
99596 ./data/a-wmav1.asf
193
2ab193df22bb473e61015e56ac11faf3 *./data/out.wav
194 193
stddev:12251.50 PSNR:14.56 bytes:1056768
195 194
stddev:2106.00 PSNR:29.85 bytes:1048576
196 195
df1c902a4518a06afed977a8a74a60c9 *./data/a-wmav2.asf
197 196
99602 ./data/a-wmav2.asf
198
8d05d345bc14153f3d0da95fdf34e084 *./data/out.wav
199 197
stddev:12255.92 PSNR:14.55 bytes:1056768
200 198
stddev:2099.31 PSNR:29.88 bytes:1048576

Also available in: Unified diff