X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=6cc7db65f3d81bf248e87e4050d6e78188f6f62f;hb=4e6268ab188ca22c042dde3d86bb24c0c01b715a;hp=385e211acf131659344edd974d8ee0bc6c94cb11;hpb=13302ad320d01d4b0a931b91d4deb03c35fb5b7c;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 385e211..6cc7db6 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -20,7 +20,11 @@ trames=1
 dry_run=0
 
 SED=sed
-FFMPEG_OPTS="-hide_banner -loglevel error -y"
+
+# 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 +61,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,11 +77,12 @@ 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}"
 }
 
 # Arg1: group name
@@ -87,30 +93,53 @@ function get_group_ref()
     echo "${token}"
 }
 
-# Get duplicate from. Ex: "label:dup1-7 planXYZ,geometry..." will return 1
-# Arg1: line
+# 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}"
+}
+
+# Arg1: start frame
+# Arg1: end frame
+function insert_empty_frames()
+{
+    local w
+    local start
+    local end
+
+    start=${1}
+    end=${2}
+
+    for w in $(seq ${start} ${end}); do
+        log_dbg "New frame ID: ${w} (empty)"
+        cp ${dest}/background.png ${dest}/${group}-f${w}.png
+    done
 }
 
 function generate_video()
 {
     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:
+            log_dbg "generate_video start"
+            if [ ${dry_run} -eq 1 ]; then
+                touch ${dest}/${group}.mp4
+            else
                 ffmpeg ${FFMPEG_OPTS} -r ${fps} -start_number 1 -i ${dest}/${group}-f%d.png ${dest}/${group}.mp4
             fi
+
+            log_dbg "generate_video: end"
         fi
     fi
 }
@@ -216,16 +245,17 @@ if [ ${trames} -eq 1 ]; then
     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
@@ -270,11 +300,10 @@ 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