diff options
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/codec-regression.sh | 5 | ||||
-rwxr-xr-x | tests/lavf-regression.sh | 5 | ||||
-rwxr-xr-x | tests/lavfi-regression.sh | 1 | ||||
-rw-r--r-- | tests/ref/acodec/aref | 2 | ||||
-rw-r--r-- | tests/ref/vsynth1/vref | 2 | ||||
-rw-r--r-- | tests/ref/vsynth2/vref | 2 | ||||
-rwxr-xr-x | tests/regression-funcs.sh | 22 |
7 files changed, 13 insertions, 26 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index 5f4e539381..70a77e5558 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -12,14 +12,13 @@ set -e eval do_$test=y rm -f "$logfile" -rm -f "$benchfile" # generate reference for quality check if [ -n "$do_vref" ]; then -do_ffmpeg_nocheck $raw_ref -f image2 -vcodec pgmyuv -i $raw_src -an -f rawvideo $target_path/$raw_ref +do_ffmpeg $raw_ref -f image2 -vcodec pgmyuv -i $raw_src -an -f rawvideo fi if [ -n "$do_aref" ]; then -do_ffmpeg_nocheck $pcm_ref -ab 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav $target_path/$pcm_ref +do_ffmpeg $pcm_ref -ab 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav fi if [ -n "$do_mpeg" ] ; then diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 28f53f78b0..94d258334b 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -44,7 +44,6 @@ do_audio_only() } rm -f "$logfile" -rm -f "$benchfile" if [ -n "$do_avi" ] ; then do_lavf avi @@ -227,8 +226,8 @@ conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \ monob yuv440p yuvj440p" for pix_fmt in $conversions ; do file=${outfile}${pix_fmt}.yuv - do_ffmpeg_nocheck $file $DEC_OPTS -r 1 -t 1 -f image2 -vcodec pgmyuv -i $raw_src \ - $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst + run_ffmpeg $DEC_OPTS -r 1 -t 1 -f image2 -vcodec pgmyuv -i $raw_src \ + $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst do_ffmpeg $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i $target_path/$raw_dst \ $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p done diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index 129358090e..0322134163 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -12,7 +12,6 @@ set -e eval do_$test=y rm -f "$logfile" -rm -f "$benchfile" do_video_filter() { label=$1 diff --git a/tests/ref/acodec/aref b/tests/ref/acodec/aref new file mode 100644 index 0000000000..8e6773be3b --- /dev/null +++ b/tests/ref/acodec/aref @@ -0,0 +1,2 @@ +95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/acodec.ref.wav +1058444 ./tests/data/acodec.ref.wav diff --git a/tests/ref/vsynth1/vref b/tests/ref/vsynth1/vref new file mode 100644 index 0000000000..2defdac870 --- /dev/null +++ b/tests/ref/vsynth1/vref @@ -0,0 +1,2 @@ +c5ccac874dbf808e9088bc3107860042 *./tests/data/vsynth1.ref.yuv +7603200 ./tests/data/vsynth1.ref.yuv diff --git a/tests/ref/vsynth2/vref b/tests/ref/vsynth2/vref new file mode 100644 index 0000000000..8f83b6c7ba --- /dev/null +++ b/tests/ref/vsynth2/vref @@ -0,0 +1,2 @@ +dde5895817ad9d219f79a52d0bdfb001 *./tests/data/vsynth2.ref.yuv +7603200 ./tests/data/vsynth2.ref.yuv diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index 0e4ea44f46..b79c258e77 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -23,9 +23,6 @@ errfile="$datadir/$this.err" # various files ffmpeg="$target_exec ${target_path}/ffmpeg" tiny_psnr="tests/tiny_psnr" -benchfile="$datadir/$this.bench" -bench="$datadir/$this.bench.tmp" -bench2="$datadir/$this.bench2.tmp" raw_src="${target_path}/$raw_src_dir/%02d.pgm" raw_dst="$datadir/$this.out.yuv" raw_ref="$datadir/$test_ref.ref.yuv" @@ -35,7 +32,7 @@ pcm_ref="$datadir/$test_ref.ref.wav" crcfile="$datadir/$this.crc" target_crcfile="$target_datadir/$this.crc" -cleanfiles="$raw_dst $pcm_dst $crcfile $bench $bench2" +cleanfiles="$raw_dst $pcm_dst $crcfile" trap 'rm -f -- $cleanfiles' EXIT mkdir -p "$datadir" @@ -69,7 +66,7 @@ do_ffmpeg() f="$1" shift set -- $* ${target_path}/$f - run_ffmpeg -benchmark $* > $bench + run_ffmpeg $* do_md5sum $f >> $logfile if [ $f = $raw_dst ] ; then $tiny_psnr $f $raw_ref >> $logfile @@ -78,8 +75,6 @@ do_ffmpeg() else wc -c $f >> $logfile fi - expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2 - echo $(cat $bench2) $f >> $benchfile } do_ffmpeg_nomd5() @@ -87,7 +82,7 @@ do_ffmpeg_nomd5() f="$1" shift set -- $* ${target_path}/$f - run_ffmpeg -benchmark $* > $bench + run_ffmpeg $* if [ $f = $raw_dst ] ; then $tiny_psnr $f $raw_ref >> $logfile elif [ $f = $pcm_dst ] ; then @@ -95,8 +90,6 @@ do_ffmpeg_nomd5() else wc -c $f >> $logfile fi - expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2 - echo $(cat $bench2) $f >> $benchfile } do_ffmpeg_crc() @@ -107,15 +100,6 @@ do_ffmpeg_crc() echo "$f $(cat $crcfile)" >> $logfile } -do_ffmpeg_nocheck() -{ - f="$1" - shift - run_ffmpeg -benchmark $* > $bench - expr "$(cat $bench)" : '.*utime=\(.*s\)' > $bench2 - echo $(cat $bench2) $f >> $benchfile -} - do_video_decoding() { do_ffmpeg $raw_dst $DEC_OPTS $1 -i $target_path/$file -f rawvideo $ENC_OPTS $2 |