X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=7dc2bb24ddd8cceaa274f6efee54071f47f29288;hb=e00c72a094bd8ef422be8d6e6c89b9b3f656246a;hp=86e9b55b0590a9cd383e3fb27f504d14537452c1;hpb=b556594cb27d99803cb725a83a758b122de20da7;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 86e9b55..7dc2bb2 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=""
@@ -107,14 +113,55 @@ function get_dup_to()
     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
 }
@@ -220,7 +267,7 @@ if [ ${trames} -eq 1 ]; then
     nf=""
     oldnf=""
     files=""
-    group=""
+    group="default"
 
     while read l; do
         scene=$(get_scene_id "${l}")
@@ -275,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
@@ -301,8 +349,10 @@ 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}
                 done
             fi