projects
/
fgen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add FPS CLI option
[fgen.git]
/
fgen.sh
diff --git
a/fgen.sh
b/fgen.sh
index
b3b1d26
..
417e222
100755
(executable)
--- a/
fgen.sh
+++ b/
fgen.sh
@@
-88,14
+88,18
@@
print_usage()
echo
echo "Options:"
echo " -d affiche les informations de debug"
echo
echo "Options:"
echo " -d affiche les informations de debug"
+ echo " -r nombre de trames par seconde (FPS)"
echo " -h affiche ce message d'aide"
}
echo " -h affiche ce message d'aide"
}
-while getopts "dh" flag ;do
+while getopts "dh
r:
" flag ;do
case ${flag} in
d)
debug="1"
;;
case ${flag} in
d)
debug="1"
;;
+ r)
+ fps="${OPTARG}"
+ ;;
h)
print_usage
exit 0
h)
print_usage
exit 0
@@
-157,10
+161,8
@@
log_dbg "CANVAS SIZE=${size}"
rm -f ${dest}/frame*.png
rm -f ${dest}/frame*.png
-# Extract global frame:
-convert ${IM_OPS} ${src}[1] ${dest}/psd0.png
-
-cp ${dest}/psd0.png ${dest}/temp.png
+# Create background frame:
+convert -size ${size} xc:none ${dest}/background.png
# Remove first line (Layer 558):
${SED} -i -e '1d' ${layers}
# Remove first line (Layer 558):
${SED} -i -e '1d' ${layers}
@@
-168,6
+170,8
@@
${SED} -i -e '1d' ${layers}
# Will start at frame 2 at first loop iteration
f=1
# Will start at frame 2 at first loop iteration
f=1
+files=""
+
while read l; do
f=$((${f} + 1))
while read l; do
f=$((${f} + 1))
@@
-184,22
+188,17
@@
while read l; do
continue
fi
continue
fi
- convert ${IM_OPS} ${src}[${f}] ${dest}/psd${f}.png
-
- composite ${IM_OPS} -geometry ${p} ${dest}/psd${f}.png ${dest}/temp.png ${dest}/temp.png
+ files="${files} -page ${p} ${src}[${f}]"
-if [ x"${nf}" != x"" ]; then
+
if [ x"${nf}" != x"" ]; then
log_dbg "New frame ID: ${nf}"
log_dbg "New frame ID: ${nf}"
- c
p ${dest}/temp.png
${dest}/f${nf}.png
- cp ${dest}/psd0.png ${dest}/temp.png
+ c
onvert -page +0+0 ${dest}/background.png ${files} -background none -layers merge
${dest}/f${nf}.png
+ files=""
fi
fi
+
done <${layers}
if which ffmpeg 1> /dev/null 2>&1; then
# Conversion vidéo:
ffmpeg -y -r ${fps} -start_number 1 -i ${dest}/f%d.png ${dest}/sequence.mp4
fi
done <${layers}
if which ffmpeg 1> /dev/null 2>&1; then
# Conversion vidéo:
ffmpeg -y -r ${fps} -start_number 1 -i ${dest}/f%d.png ${dest}/sequence.mp4
fi
-
-rm -f ${dest}/temp.png
-
-#rm -f ${dest}/psd*.png