X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=5634d6a38098dfdd2ba774b0f4539d0433310a48;hb=7ccc6cc8a5c361f97050434149d75483132d59aa;hp=9fbd121556d65c83f9f6c38bc87c9f6c688958c9;hpb=4945ffa46ea1d5339e877de183b25cda5ed4f8e8;p=fgen.git diff --git a/fgen.sh b/fgen.sh index 9fbd121..5634d6a 100755 --- a/fgen.sh +++ b/fgen.sh @@ -20,7 +20,13 @@ 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="" @@ -57,11 +63,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 @@ -72,37 +79,89 @@ function get_scene_id() echo "${token}" } -# Arg1: line +# Arg1: label function get_group_id() { - group=$(echo "${1}" | grep -e "label:groupe.*" | ${SED} "s/.*label:groupe-\(.*\),geometry.*/\1/g") - echo "${group}" + local token + token=$(echo "${1}" | grep -e "^groupe" | ${SED} "s/^groupe-\(.*\)/\1/g") + echo "${token}" } -# Get duplicate from. Ex: "label:dup1-7 planXYZ,geometry..." will return 1 -# Arg1: line +# 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() { - dup=$(echo "${1}" | grep -e "label:dup.*" | ${SED} "s/.*label:dup\([0-9]\+\)-.*,geometry.*/\1/g") - echo "${dup}" + local token + token=$(echo "${1}" | grep -e "^dup" | ${SED} "s/^dup\([0-9]\+\)-.*/\1/g") + echo "${token}" } -# Get duplicate to. Ex: "label:dup1-7 planXYZ,geometry..." will return 7 -# Arg1: line +# Get duplicate to. Ex: "dup1-7 planXYZ,geometry..." will return 7 +# Arg1: label function get_dup_to() { - dup=$(echo "${1}" | grep -e "label:dup.*" | ${SED} "s/.*label:dup[0-9]\+-\([0-9]\+\).*,geometry.*/\1/g") - echo "${dup}" + 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 - if [ -f ${dest}/${group}-f1.png ]; then - if [ ${dry_run} -eq 0 ]; then - # Conversion vidéo: - ffmpeg ${FFMPEG_OPTS} -r ${fps} -start_number 1 -i ${dest}/${group}-f%d.png ${dest}/${group}.mp4 + 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 } @@ -202,35 +261,41 @@ if [ ${trames} -eq 1 ]; then # 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="" + group="default" while read l; do scene=$(get_scene_id "${l}") label=$(get_label "${l}") p=$(get_pos "${l}") - nf=$(get_frame_id "${l}") - ng=$(get_group_id "${l}") - dup_from=$(get_dup_from "${l}") - dup_to=$(get_dup_to "${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 - generate_video + if [ x"${group_ref}" != x"ref" ]; then + generate_video + fi group="${ng}" log_dbg "New group: ${ng}" @@ -243,9 +308,11 @@ if [ ${trames} -eq 1 ]; then continue fi - log_dbg "Layer ${scene}" - log_dbg " nom: ${label}" - log_dbg " pos: ${p}" + 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}]" @@ -255,22 +322,23 @@ if [ ${trames} -eq 1 ]; then expected_nf=$((${oldnf} + 1)) if [ ${expected_nf} -ne ${nf} ]; then - echo "Error: invalid frame sequence: ${nf}" + echo "Warning: non-sequential frame sequence: ${nf}" echo " previous: ${oldnf}" echo " expected: ${expected_nf}" - files="" - continue + insert_empty_frames ${expected_nf} $((${nf} -1)) fi fi log_dbg "New frame ID: ${nf}" + fname=$(get_frame_name ${nf}) + if [ ${dry_run} -eq 1 ]; then - touch ${dest}/${group}-f${nf}.png + touch ${fname} else convert -colorspace sRGB -page +0+0 ${dest}/background.png \ ${files} -background none -layers merge \ - ${dest}/${group}-f${nf}.png + ${fname} fi if [ x"${dup_from}" != x"" ]; then @@ -281,8 +349,12 @@ if [ ${trames} -eq 1 ]; then for w in $(seq ${dup_start} ${dup_to}); do log_dbg "New frame ID: ${w} (duplicate)" + wfname=$(get_frame_name ${w}) + # Use symlink??? - cp ${dest}/${group}-f${nf}.png ${dest}/${group}-f${w}.png + cp ${fname} ${wfname} + + nf=${w} done fi