X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=64baf440147991142c7a5d2e917bf47007424fee;hb=086b3bab00204b52cc17770b04cd5d4a9d0c5cba;hp=a0c3800fd00f8f80e477aae6b69efda180c35cf1;hpb=1e14661c07e4c758f5cee9cb54d7d59ee63b9dfa;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index a0c3800..64baf44 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -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=""
@@ -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 ""
@@ -145,7 +146,6 @@ layers=${dest}/layers.txt
 
 if [ ! -d ${dest} ]; then
     mkdir ${dest}
-    #    rm -rf ${dest}
 fi
 
 for tool in convert composite identify; do
@@ -175,6 +175,8 @@ if [ ${trames} -eq 1 ]; then
     # Will start at frame 2 at first loop iteration
     f=1
 
+    nf=""
+    oldnf=""
     files=""
 
     while read l; do
@@ -196,14 +198,28 @@ if [ ${trames} -eq 1 ]; then
         files="${files} -page ${p} ${src}[${f}]"
 
         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