X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=8de4036d72c2543dfe3bff07b7b36ae523cbf0b9;hb=75efbf87ea3f7b4ba4a557ba016ff8cc4a4c703f;hp=4fe0634111e6615d749da9297bf77c5ff125d9bd;hpb=e2483c8b18aa2cf29edf5b4e70f26d3c367a41a1;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 4fe0634..8de4036 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -9,7 +9,7 @@ set -e
 PROG_NAME=$(basename $0)
 
 # Set default values
-main_layer="Layer 558"
+bg_layer_name="background"
 
 # Pour conversion vidéo:
 fps=8
@@ -17,6 +17,7 @@ fps=8
 debug=0
 trames=1
 SED=sed
+FFMPEG_OPTS="-hide_banner -loglevel error -y"
 
 # -limit memory 5000mb -limit disk 5gb
 IM_OPS=""
@@ -36,19 +37,19 @@ function log_dbg() {
 # Arg1: layer
 function get_size()
 {
-    cat ${layers} | grep "${1}" | ${SED} "s/.*geometry:\([0-9]\+x[0-9]\+\).*/\1/g"
+    cat ${layers} | grep -m 1 "${1}" | ${SED} "s/.*geometry:\([0-9]\+x[0-9]\+\).*/\1/g"
 }
 
 # Arg1: layer
 function get_pos()
 {
-    cat ${layers} | grep "${1}" | ${SED} "s/.*geometry:[0-9]\+x[0-9]\+\(+[0-9]\+[0-9]\+\)/\1/g"
+    cat ${layers} | grep "${1}" | ${SED} "s/.*geometry:[0-9]\+x[0-9]\+\(+[0-9]\++[0-9]\+\),.*/\1/g"
 }
 
 # Arg1: line
 function get_label()
 {
-    frame=$(echo "${1}" | grep -e "label:.*," | ${SED} "s/label:\(.*\),.*/\1/g")
+    frame=$(echo "${1}" | ${SED} "s/.*label:\(.*\),geometry.*/\1/g")
 
     if [ x"${frame}" = x"" ]; then
         echo ""
@@ -62,7 +63,7 @@ function get_label()
 # Arg1: line
 function get_frame_id()
 {
-    frame=$(echo "${1}" | grep -e "label:[0-9]" | ${SED} "s/label:\([0-9]\+\),.*/\1/g")
+    frame=$(echo "${1}" | grep -e "label:[0-9]\+," | ${SED} "s/.*label:\([0-9]\+\),.*/\1/g")
 
     if [ x"${frame}" = x"" ]; then
         echo ""
@@ -71,6 +72,14 @@ function get_frame_id()
     fi
 }
 
+# Arg1: line
+function get_scene_id()
+{
+    local token
+    token=$(echo "${1}" | ${SED} "s/.*scene:\([0-9]\+\),.*/\1/g")
+    echo "${token}"
+}
+
 # Arg1: label
 function is_skip_label()
 {
@@ -145,7 +154,6 @@ layers=${dest}/layers.txt
 
 if [ ! -d ${dest} ]; then
     mkdir ${dest}
-    #    rm -rf ${dest}
 fi
 
 for tool in convert composite identify; do
@@ -156,35 +164,39 @@ for tool in convert composite identify; do
 done
 
 if [ ${trames} -eq 1 ]; then
-    identify ${IM_OPS} -verbose -format "label:%l,geometry:%g\n" ${src} > ${layers}
+    # %s: scene number
+    identify ${IM_OPS} -verbose -format "scene:%s,label:%l,geometry:%g,\n" ${src} > ${layers}
 
-    # Ignore empty labels:
+    # Remove line(s) with empty label:
     ${SED} -i -e /label:,.*/d ${layers}
 
     # Extract global frame size:
-    size=$(get_size "${main_layer}")
+    size=$(get_size "${bg_layer_name}")
 
-    log_dbg "CANVAS SIZE=${size}"
+    log_dbg "Background size: ${size}"
 
-    # Create background frame:
-    convert -size ${size} xc:none ${dest}/background.png
+    if [ x"${size}" = x"" ]; then
+        echo "Error: background layer not found"
+        exit 1
+    fi
 
-    # Remove first line (Layer 558):
-    ${SED} -i -e '1d' ${layers}
+    # Remove background line:
+    ${SED} -i -e /label:${bg_layer_name},.*/d ${layers}
 
-    # Will start at frame 2 at first loop iteration
-    f=1
+    # Create background frame:
+    convert -size ${size} xc:none ${dest}/background.png
 
+    nf=""
+    oldnf=""
     files=""
 
     while read l; do
-        f=$((${f} + 1))
-
+        scene=$(get_scene_id "${l}")
         label=$(get_label "${l}")
         p=$(get_pos "${l}")
         nf=$(get_frame_id "${l}")
 
-        log_dbg "Couche ${f}"
+        log_dbg "Layer ${scene}"
         log_dbg "  nom: ${label}"
         log_dbg "  pos: ${p}"
 
@@ -193,17 +205,31 @@ if [ ${trames} -eq 1 ]; then
             continue
         fi
 
-        files="${files} -page ${p} ${src}[${f}]"
+        files="${files} -page ${p} ${src}[${scene}]"
 
         if [ x"${nf}" != x"" ]; then
+            # Only check expected frame if oldnf is set...
+            if [ x"${oldnf}" != x"" ]; 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
+                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
             files=""
+            oldnf="${nf}"
         fi
     done <${layers}
 fi
 
 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
+    ffmpeg ${FFMPEG_OPTS} -r ${fps} -start_number 1 -i ${dest}/f%d.png ${dest}/sequence.mp4
 fi