diff options
Diffstat (limited to 'tests/regression-funcs.sh')
-rwxr-xr-x | tests/regression-funcs.sh | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index c6ca00b2aa..827a424582 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -11,6 +11,7 @@ target_exec=$4 target_path=$5 threads=${6:-1} cpuflags=${8:-all} +samples=$9 datadir="./tests/data" target_datadir="${target_path}/${datadir}" @@ -19,7 +20,7 @@ this="$test.$test_ref" outfile="$datadir/$test_ref/" # various files -avconv="$target_exec ${target_path}/avconv" +avconv="$target_exec ${target_path}/ffmpeg" tiny_psnr="tests/tiny_psnr" raw_src="${target_path}/$raw_src_dir/%02d.pgm" raw_dst="$datadir/$this.out.yuv" @@ -27,6 +28,8 @@ raw_ref="$datadir/$test_ref.ref.yuv" pcm_src="$target_datadir/asynth1.sw" pcm_dst="$datadir/$this.out.wav" pcm_ref="$datadir/$test_ref.ref.wav" +pcm_src_1ch="$target_datadir/asynth-16000-1.wav" +pcm_ref_1ch="$datadir/$test_ref-16000-1.ref.wav" crcfile="$datadir/$this.crc" target_crcfile="$target_datadir/$this.crc" @@ -96,7 +99,7 @@ do_avconv_crc() do_video_decoding() { - do_avconv $raw_dst $DEC_OPTS $1 -i $target_path/$file -f rawvideo $ENC_OPTS $2 + do_avconv $raw_dst $DEC_OPTS $1 -i $target_path/$file -f rawvideo $ENC_OPTS -vsync 0 $2 } do_video_encoding() @@ -105,6 +108,12 @@ do_video_encoding() do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS $2 } +do_video_encoding_nomd5() +{ + file=${outfile}$1 + do_avconv_nomd5 $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS $2 +} + do_audio_encoding() { file=${outfile}$1 @@ -113,5 +122,10 @@ do_audio_encoding() do_audio_decoding() { - do_avconv $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav + do_avconv $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav $1 +} + +do_audio_decoding_nomd5() +{ + do_avconv_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav $1 } |