X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=56b162e8664aa952ea734bfbe46e27239dc11774;hb=e94c6ad740fc4fb40ca32ea3e1a95b6bd9a1c73b;hp=99bc69d308fb65632294a8fd33bb1150ba08311c;hpb=80e1e559dc73992906a74cc854122211f8706f19;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 99bc69d..56b162e 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -15,7 +15,7 @@ main_layer="Layer 558"
 fps=8
 
 debug=0
-
+trames=1
 SED=sed
 
 # -limit memory 5000mb -limit disk 5gb
@@ -36,7 +36,7 @@ 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
@@ -62,7 +62,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 ""
@@ -90,15 +90,19 @@ print_usage()
     echo
     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 "  -r   nombre de trames par seconde (FPS)"
     echo "  -h   affiche ce message d'aide"
 }
 
-while getopts "dhr:" flag ;do
+while getopts "dhfr:" flag ;do
     case ${flag} in
         d)
             debug="1"
             ;;
+        f)
+            trames=0
+            ;;
         r)
             fps="${OPTARG}"
             ;;
@@ -141,7 +145,6 @@ layers=${dest}/layers.txt
 
 if [ ! -d ${dest} ]; then
     mkdir ${dest}
-    #    rm -rf ${dest}
 fi
 
 for tool in convert composite identify; do
@@ -151,52 +154,69 @@ for tool in convert composite identify; do
     fi
 done
 
-identify ${IM_OPS} -verbose -format "label:%l,geometry:%g\n" ${src} > ${layers}
+if [ ${trames} -eq 1 ]; then
+    identify ${IM_OPS} -verbose -format "label:%l,geometry:%g\n" ${src} > ${layers}
 
-# Ignore empty labels:
-${SED} -i -e /label:,.*/d ${layers}
+    # Ignore empty labels:
+    ${SED} -i -e /label:,.*/d ${layers}
 
-# Extract global frame size:
-size=$(get_size "${main_layer}")
+    # Extract global frame size:
+    size=$(get_size "${main_layer}")
 
-log_dbg "CANVAS SIZE=${size}"
+    log_dbg "CANVAS SIZE=${size}"
 
-# Create background frame:
-convert -size ${size} xc:none ${dest}/background.png
+    # Create background frame:
+    convert -size ${size} xc:none ${dest}/background.png
 
-# Remove first line (Layer 558):
-${SED} -i -e '1d' ${layers}
+    # Remove first line (Layer 558):
+    ${SED} -i -e '1d' ${layers}
 
-# Will start at frame 2 at first loop iteration
-f=1
+    # Will start at frame 2 at first loop iteration
+    f=1
 
-files=""
+    nf=""
+    oldnf=""
+    files=""
 
-while read l; do
-    f=$((${f} + 1))
+    while read l; do
+        f=$((${f} + 1))
 
-    label=$(get_label "${l}")
-    p=$(get_pos "${l}")
-    nf=$(get_frame_id "${l}")
+        label=$(get_label "${l}")
+        p=$(get_pos "${l}")
+        nf=$(get_frame_id "${l}")
 
-    log_dbg "Couche ${f}"
-    log_dbg "  nom: ${label}"
-    log_dbg "  pos: ${p}"
+        log_dbg "Couche ${f}"
+        log_dbg "  nom: ${label}"
+        log_dbg "  pos: ${p}"
 
-    if is_skip_label "${label}"; then
-        log_dbg "  skip..."
-        continue
-    fi
+        if is_skip_label "${label}"; then
+            log_dbg "  skip..."
+            continue
+        fi
 
-    files="${files} -page ${p} ${src}[${f}]"
+        files="${files} -page ${p} ${src}[${f}]"
 
-    if [ x"${nf}" != x"" ]; then
-        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=""
-    fi
+        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
 
-done <${layers}
+            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: