X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=8a700c7e621a063d9915dbaef7a861ee722075e1;hb=826c3d6c2e7f42dfe8dcea624fb1c33cda7b1d8e;hp=f50e0001b2c1c650b273392cab21f301e35cd170;hpb=7283be718ea35c5c4844077fd6fa10813c7aa3b9;p=fgen.git diff --git a/fgen.sh b/fgen.sh index f50e000..8a700c7 100755 --- a/fgen.sh +++ b/fgen.sh @@ -17,8 +17,16 @@ fps=8 debug=0 trames=1 +dry_run=0 + SED=sed -FFMPEG_OPTS="-hide_banner -loglevel error -y" + +F_FMT="%04d" + +# When reading a file line by line, if a command inside the loop +# also reads stdin, it can exhaust the input file. +# -nostdin: disable ffmpeg interaction on standard input: +FFMPEG_OPTS="-hide_banner -loglevel error -y -nostdin" # -limit memory 5000mb -limit disk 5gb IM_OPS="" @@ -29,12 +37,28 @@ case ${OSTYPE} in ;; esac +COLOR_ERR="\033[0;31m" +COLOR_WARN="\033[0;33m" +COLOR_NONE="\033[0m" + +function log_info() { + echo -e "${COLOR_NONE}${*}" +} + function log_dbg() { if [ x"${debug}" = x"1" ]; then echo "${*}" fi } +function log_warn() { + echo -e "${COLOR_WARN}${*}${COLOR_NONE}" +} + +function log_err() { + echo -e "${COLOR_ERR}${*}${COLOR_NONE}" +} + # Arg1: layer function get_size() { @@ -55,11 +79,12 @@ function get_label() echo "${token}" } -# Arg1: line +# Arg1: label function get_frame_id() { - frame=$(echo "${1}" | grep -e "label:[0-9]\+" | ${SED} "s/.*label:\([0-9]\+\).*,geometry.*/\1/g") - echo "${frame}" + local token + token=$(echo "${1}" | grep -e "^[0-9]\+" | ${SED} "s/^\([0-9]\+\).*/\1/g") + echo "${token}" } # Arg1: line @@ -70,6 +95,93 @@ function get_scene_id() echo "${token}" } +# Arg1: label +function get_group_id() +{ + local token + token=$(echo "${1}" | grep -e "^groupe" | ${SED} "s/^groupe-\(.*\)/\1/g") + echo "${token}" +} + +# Arg1: group name +function get_group_ref() +{ + local token + token=$(echo "${1}" | grep -e "^ref" | ${SED} "s/^\(ref\).*/\1/g") + echo "${token}" +} + +# Get duplicate from. Ex: "dup1-7 planXYZ,geometry..." will return 1 +# Arg1: label +function get_dup_from() +{ + local token + token=$(echo "${1}" | grep -e "^dup" | ${SED} "s/^dup\([0-9]\+\)-.*/\1/g") + echo "${token}" +} + +# Get duplicate to. Ex: "dup1-7 planXYZ,geometry..." will return 7 +# Arg1: label +function get_dup_to() +{ + local token + token=$(echo "${1}" | grep -e "^dup" | ${SED} "s/^dup[0-9]\+-\([0-9]\+\).*/\1/g") + echo "${token}" +} + +# Generate frame index name with leading zeroes: +# Arg1: frame number +function get_frame_name() +{ + local index + + index=$(printf "${F_FMT}" ${1}) + echo "${dest}/${group}-f${index}.png" +} + +# Arg1: start frame +# Arg1: end frame +function insert_empty_frames() +{ + local w + local start + local end + local wfname + + start=${1} + end=${2} + + for w in $(seq ${start} ${end}); do + log_dbg "New frame ID: ${w} (empty)" + + wfname=$(get_frame_name ${w}) + + cp ${dest}/background.png ${wfname} + done +} + +function generate_video() +{ + local png_files + + if which ffmpeg 1> /dev/null 2>&1; then + set +e + png_files=$(ls ${dest}/${group}-f*.png 2> /dev/null) + set -e + + if [ x"${png_files}" != x"" ]; then + log_dbg "generate_video start" + if [ ${dry_run} -eq 1 ]; then + touch ${dest}/${group}.mp4 + else + ffmpeg ${FFMPEG_OPTS} -r ${fps} -pattern_type glob -i "${dest}/${group}-f*.png" ${dest}/${group}.mp4 + fi + + log_dbg "generate_video: end" + fi + fi +} + print_usage() { echo "${PROG_NAME} -- Générateur de séquence d'images PNG à partir d'un fichier Photoshop (PSD)." @@ -78,11 +190,12 @@ print_usage() echo "Options:" echo " -d affiche les informations de debug" echo " -f ne regénère pas les trames, mais uniquement la séquence vidéo" + echo " -n mode de test (dry-run)" echo " -r nombre de trames par seconde (FPS)" echo " -h affiche ce message d'aide" } -while getopts "dhfr:" flag ;do +while getopts "dhfnr:" flag ;do case ${flag} in d) debug="1" @@ -90,6 +203,9 @@ while getopts "dhfr:" flag ;do f) trames=0 ;; + n) + dry_run=1 + ;; r) fps="${OPTARG}" ;; @@ -121,7 +237,7 @@ if [ $# -gt 1 ]; then fi if [ ! -f "${1}" ]; then - echo "Error: PSD source file not found" + log_err "Error: PSD source file not found" exit 1 fi @@ -154,33 +270,66 @@ if [ ${trames} -eq 1 ]; then log_dbg "Background size: ${size}" if [ x"${size}" = x"" ]; then - echo "Error: background layer not found" + log_err "Error: background layer not found" exit 1 fi # Remove background line: ${SED} -i -e /label:${bg_layer_name},.*/d ${layers} - # Remove reference lines: - ${SED} -i -e /label:${ref_layer_prefix}.*/d ${layers} - # Create background frame: convert -size ${size} xc:none ${dest}/background.png nf="" oldnf="" files="" + group="default" while read l; do scene=$(get_scene_id "${l}") label=$(get_label "${l}") p=$(get_pos "${l}") - nf=$(get_frame_id "${l}") + + nf=$(get_frame_id "${label}") + ng=$(get_group_id "${label}") + dup_from=$(get_dup_from "${label}") + dup_to=$(get_dup_to "${label}") + + # Also indicate a new frame, but to be copied from..to: + if [ x"${dup_from}" != x"" ]; then + nf=${dup_from} + fi log_dbg "Layer ${scene}" log_dbg " nom: ${label}" log_dbg " pos: ${p}" + group_ref=$(get_group_ref "${group}") + log_dbg " group_ref: ${group_ref}" + + # Only change group if ng is set... + if [ x"${ng}" != x"" ]; then + if [ x"${group_ref}" != x"ref" ]; then + generate_video + fi + + group="${ng}" + log_info "New group: ${ng}" + + nf="" + oldnf="" + files="" + + # Skip image from group ID... + continue + fi + + if [ x"${group_ref}" != x"" ]; then + # Ignore all images in groupe-ref: + log_dbg " ignore (groupe-ref)" + continue + fi + files="${files} -page ${p} ${src}[${scene}]" if [ x"${nf}" != x"" ]; then @@ -189,23 +338,47 @@ if [ ${trames} -eq 1 ]; then expected_nf=$((${oldnf} + 1)) if [ ${expected_nf} -ne ${nf} ]; then - echo "Error: invalid frame sequence: ${nf}" - echo " previous: ${oldnf}" - echo " expected: ${expected_nf}" - files="" - continue + log_warn "Warning: non-sequential frame sequence: ${nf}" + log_warn " previous: ${oldnf}" + log_warn " expected: ${expected_nf}" + insert_empty_frames ${expected_nf} $((${nf} -1)) fi fi log_dbg "New frame ID: ${nf}" - convert -colorspace sRGB -page +0+0 ${dest}/background.png ${files} -background none -layers merge ${dest}/f${nf}.png + + fname=$(get_frame_name ${nf}) + + if [ ${dry_run} -eq 1 ]; then + touch ${fname} + else + convert -colorspace sRGB -page +0+0 ${dest}/background.png \ + ${files} -background none -layers merge \ + PNG32:${fname} + fi + + if [ x"${dup_from}" != x"" ]; then + log_dbg " dup from: ${dup_from}" + log_dbg " dup to: ${dup_to}" + + dup_start=$((${dup_from} + 1)) + for w in $(seq ${dup_start} ${dup_to}); do + log_dbg "New frame ID: ${w} (duplicate)" + + wfname=$(get_frame_name ${w}) + + # Use symlink??? + cp ${fname} ${wfname} + + nf=${w} + done + fi + files="" oldnf="${nf}" fi done <${layers} fi -if which ffmpeg 1> /dev/null 2>&1; then - # Conversion vidéo: - ffmpeg ${FFMPEG_OPTS} -r ${fps} -start_number 1 -i ${dest}/f%d.png ${dest}/sequence.mp4 -fi +# Special case for last group... +generate_video