[ x${arg} = x-i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}"
ffmpeg_args="${ffmpeg_args} ${arg}"
done
- run ffmpeg${PROGSUF} ${ffmpeg_args}
+ run ffmpeg${PROGSUF}${EXECSUF} ${ffmpeg_args}
}
framecrc(){
# FIXME: There is a certain duplication between the avconv-related helper
# functions above and below that should be refactored.
-ffmpeg2="$target_exec ${target_path}/ffmpeg"
+ffmpeg2="$target_exec ${target_path}/ffmpeg${PROGSUF}${EXECSUF}"
raw_src="${target_path}/tests/vsynth1/%02d.pgm"
pcm_src="${target_path}/tests/data/asynth1.sw"
crcfile="tests/data/$test.lavf.crc"
echo "$@" >&3
}
-AVCONV_OPTS="-nostdin -nostats -y -cpuflags $cpuflags -threads $threads"
-DEC_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
-ENC_OPTS="$DEC_OPTS -threads $threads -dct fastint"
+AVCONV_OPTS="-nostdin -nostats -y -cpuflags $cpuflags"
+COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
+DEC_OPTS="$COMMON_OPTS -threads $threads"
+ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint"
run_avconv(){
$echov $ffmpeg2 $AVCONV_OPTS $*
outdir="tests/data/images/$t"
mkdir -p "$outdir"
file=${outdir}/%02d.$t
- run_avconv $DEC_OPTS $1 -f image2 -c:v pgmyuv -i $raw_src "$ENC_OPTS -metadata title=lavftest" $2 -frames 13 -y -qscale 10 $target_path/$file
+ run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $1 "$ENC_OPTS -metadata title=lavftest" -frames 13 -y -qscale 10 $target_path/$file
do_md5sum ${outdir}/02.$t
- do_avconv_crc $file $DEC_OPTS $2 -i $target_path/$file
+ do_avconv_crc $file $DEC_OPTS $2 -i $target_path/$file $2
echo $(wc -c ${outdir}/02.$t)
}