Add VIDEO_BEFORE_STOP_SLEEP_SECS and VIDEO_AFTER_STOP_SLEEP_SECS

Author: elgalu

CHANGELOG.md

@@ -7,6 +7,34 @@ Note image ids also change after scm-source.json has being updated which trigger
 ###### To get container versions
     docker exec grid versions
 
+## TBD_DOCKER_TAG
+ + Date: TBD_DATE
+ + Split VIDEO_STOP_SLEEP_SECS="1" into
+ +  VIDEO_BEFORE_STOP_SLEEP_SECS and
+ +  VIDEO_AFTER_STOP_SLEEP_SECS
+ + Drop VIDEO_CHUNKS_MAX=999 as it is buggy
+ + Image tag details:
+  + Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
+  + Selenium 3: 3.1.0 (86a5d70)
+  + Chrome stable:  TBD_CHROME_STABLE
+  + Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
+  + Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
+  + Geckodriver: TBD_GECKO_DRIVER
+  + Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
+  + Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
+  + Timezone: TBD_TIME_ZONE
+  + FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
+  + Python: TBD_PYTHON_VERSION
+  + Tested on kernel dev host: 4.4.0-64-generic x86_64
+  + Tested on kernel CI  host: TBD_HOST_UNAME
+  + Built at dev host with: Docker version 1.13.1, build 092cba3
+  + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+  + Built at dev host with: Docker Compose version 1.11.2, build dfed245
+  + Built at CI  host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
+  + Image size: TBD_IMAGE_SIZE
+  + Digest: TBD_DIGEST
+  + Image ID: TBD_IMAGE_ID
+
 ## 3.1.0-p1
  + Date: 2017-02-27
  + Re-enable VIDEO_STOP_SLEEP_SECS="1" for 1 sec video fix

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 ## Local
 For pull requests or local commits:
 
-    time (./test/bef && ./test/install && ./test/script_start && ./test/script_end) ; beep
+    time (./test/bef && ./test/install && ./test/script_start && ./test/script_end)
     docker exec grid versions && ./test/after_script && travis lint
     open ./images/grid2_console.png && open ./images/grid3_console.png && open ./videos/mobile_emulation/*.mp4
     git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
@@ -12,7 +12,7 @@ For pull requests or local commits:
 
 For repository owners only:
 
-    git commit -m "Re-enable VIDEO_STOP_SLEEP_SECS="1" for 1 sec video fix"
+    git commit -m "Add VIDEO_BEFORE_STOP_SLEEP_SECS and VIDEO_AFTER_STOP_SLEEP_SECS"
     git tag -d latest && git tag `cat VERSION` && git push origin tmp-`cat VERSION` && git push --tags
 
 -- Wait for Travis to pass OK

Dockerfile

@@ -443,6 +443,8 @@ RUN apt-get -qqy update \
 # ffmpeg/libav/avconv video codecs & dependencies
 #=================================================
 # MP4Box (gpac) to clean the video credits to @taskworld @dtinth
+# ponchio/untrunc dependencies to restore a damaged (truncated) video
+#   libavformat-dev libavcodec-dev libavutil-dev libqt4-dev make g++ libz-dev
 # Layer size: medium: 11.56 MB (with --no-install-recommends)
 # Layer size: medium: 20.76 MB
 RUN apt-get -qqy update \
@@ -860,11 +862,11 @@ ENV FIREFOX_VERSION="${FF_VER}" \
   RC_CHROME="false" \
   RC_FIREFOX="false" \
   VIDEO_FILE_EXTENSION="mp4" \
-  MP4_INTERLEAVES_MEDIA_DATA_CHUNKS_SECS="500" \
+  MP4_INTERLEAVES_MEDIA_DATA_CHUNKS_SECS="50" \
   VIDEO_FILE_NAME="" \
-  VIDEO_CHUNK_SECS="00:05:00" \
-  VIDEO_CHUNKS_MAX=999 \
-  VIDEO_STOP_SLEEP_SECS="1" \
+  VIDEO_CHUNK_SECS="00:15:00" \
+  VIDEO_BEFORE_STOP_SLEEP_SECS="1" \
+  VIDEO_AFTER_STOP_SLEEP_SECS="0.5" \
   WAIT_TIME_OUT_VIDEO_STOP="20s" \
   VIDEOS_DIR="/home/seluser/videos" \
   XMANAGER="fluxbox" \
@@ -882,6 +884,7 @@ ENV FIREFOX_VERSION="${FF_VER}" \
   VNC_STOP_SIGNAL="TERM" \
   NOVNC_STOP_SIGNAL="TERM" \
   VIDEO_REC_STOP_SIGNAL="INT" \
+  VIDEO_STOPWAITSECS=20 \
   DOCKER_SOCK="/var/run/docker.sock" \
   TEST_SLEEPS="0.5" \
   SEND_ANONYMOUS_USAGE_INFO="true" \

VERSION

@@ -1 +1 @@
-3.1.0-p1
+3.1.0-p2

bin/untrunc

@@ -444,3 +444,22 @@ If you also want windows manager support, i.e. want to `make move` _(optional bu
     cd binaries && wget -O stable_updates.html "http://googlechromereleases.blogspot.de/search/label/Stable%20updates"
     VER=$(grep -Po '([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)' stable_updates.html | head -1)
     rm -f stable_updates.html && cd ..
+
+### videos
+
+##################################################
+# untrunc to restore a damaged (truncated) video #
+##################################################
+# Download ponchio/untrunc dated 2015-09-08 commit 07be275f02927417e81da7d3729a3854b9d98b37
+ENV UNTRUNC_SHA="07be275f02927417e81da7d3729a3854b9d98b37"
+RUN  wget -nv -O unTrunc.zip \
+       "https://github.com/ponchio/untrunc/archive/${UNTRUNC_SHA}.zip" \
+  && unzip -x unTrunc.zip \
+  && mv untrunc-${UNTRUNC_SHA} untrunc \
+  && rm unTrunc.zip \
+  && cd untrunc \
+  && g++ -o untrunc file.cpp main.cpp \
+            track.cpp atom.cpp mp4.cpp \
+            -L/usr/local/lib -lavformat \
+            -lavcodec -lavutil \
+  && mv untrunc /usr/bin

misc/misc.md

@@ -31,28 +31,22 @@ trap shutdown SIGTERM SIGINT SIGKILL
 #  https://www.ffmpeg.org/ffmpeg-codecs.html
 # sudo avconv -an -y -f x11grab \
 
-for i in $(seq -f "%03g" 0 ${VIDEO_CHUNKS_MAX}); do
-  video_name="${VIDEO_FILE_NAME}-$i"
-  if [ "$i" == "000" ]; then
-  	video_name="${VIDEO_FILE_NAME}"
-  fi
-  video_path="${VIDEOS_DIR}/${video_name}.${VIDEO_FILE_EXTENSION}"
-
-  # Fix perms to be able to start ffmpeg without sudo
-  sudo touch "${video_path}"
-  sudo chown seluser:seluser "${video_path}"
-
-  # avconv or ffmpeg
-  avconv -f x11grab \
-    -framerate ${FFMPEG_FRAME_RATE} \
-    -video_size ${FFMPEG_FRAME_SIZE} \
-    -i "${DISPLAY}.0+0,0" \
-    ${FFMPEG_CODEC_ARGS} \
-    -t "${VIDEO_CHUNK_SECS}" \
-    -segment_format_options movflags=+faststart \
-    -y -an "${video_path}" 2>&1 &
-  LAST_FFMPEG_PID=$!
-
-  # tells bash to wait until child processes have exited
-  wait
-done
+video_path="${VIDEOS_DIR}/${VIDEO_FILE_NAME}.${VIDEO_FILE_EXTENSION}"
+
+# Fix perms to be able to start ffmpeg without sudo
+sudo touch "${video_path}"
+sudo chown seluser:seluser "${video_path}"
+
+# avconv or ffmpeg
+avconv -f x11grab \
+  -framerate ${FFMPEG_FRAME_RATE} \
+  -video_size ${FFMPEG_FRAME_SIZE} \
+  -i "${DISPLAY}.0+0,0" \
+  ${FFMPEG_CODEC_ARGS} \
+  -t "${VIDEO_CHUNK_SECS}" \
+  -segment_format_options movflags=+faststart \
+  -y -an "${video_path}" 2>&1 &
+LAST_FFMPEG_PID=$!
+
+# tells bash to wait until child processes have exited
+wait

video-rec/bin/ffmpeg-start-sh

@@ -5,6 +5,9 @@ set -e
 
 # Optimize for HTTP streaming and fix end time
 for f in *.mp4; do
+  # ponchio/untrunc is used to restore a damaged (truncated) video
+  # untrunc /home/seluser/working_video.mp4 ${f}
+
   echo "Optimizing ${f} for HTTP streaming..."
   # -inter Duration : interleaves media data in chunks of desired
   # duration (in seconds). This is useful to optimize the file for

video-rec/bin/fix_videos.sh

@@ -22,9 +22,7 @@ VID_TOOL_PID=$!
 # sudo killall -SIGINT avconv
 function shutdown {
   echo "Trapped SIGTERM or SIGINT so shutting down ffmpeg gracefully..."
-  sleep ${VIDEO_STOP_SLEEP_SECS}
-  kill -SIGTERM ${VID_TOOL_PID} || true
-  sleep ${VIDEO_STOP_SLEEP_SECS}
+  kill -SIGINT ${VID_TOOL_PID} || true
   wait ${VID_TOOL_PID}
   fix_videos.sh
   echo "ffmpeg shutdown complete."

video-rec/bin/start-video-rec.sh

@@ -25,9 +25,9 @@ fi
 # Stop video recording
 #----------------------
 export VIDEO=false
-sleep ${VIDEO_STOP_SLEEP_SECS}
+sleep ${VIDEO_BEFORE_STOP_SLEEP_SECS}
 supervisorctl -c /etc/supervisor/supervisord.conf stop video-rec
-sleep ${VIDEO_STOP_SLEEP_SECS}
+sleep ${VIDEO_AFTER_STOP_SLEEP_SECS}
 
 # Avoid waiting forever using the `timeout` command
 if timeout --foreground ${WAIT_TIME_OUT_VIDEO_STOP} \