From 6f2dd79c3d5e214ffd38d560bab1906b3f69700d Mon Sep 17 00:00:00 2001
From: root <root@videospeicher.(none)>
Date: Fri, 4 Apr 2014 01:15:59 +0200
Subject: [PATCH] =?UTF-8?q?Aufnahme=20auf=20ffmpeg=20umgestellt,=20Dateil?=
 =?UTF-8?q?=C3=A4nge=20=3D=201=20Stunde;Ueberappung=20=3D=201=20Minute?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dump.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Dump.sh b/Dump.sh
index 86c0d08..fc21244 100755
--- a/Dump.sh
+++ b/Dump.sh
@@ -7,16 +7,19 @@ USERNAME=admin
 PASSWORD="123456"
 CAMERAS="0 1 2 3 4 5 6 7 8 9"
 # the real values _will_ differ depending on the machine running the script !!!
-SECONDS_PER_FILE=60
-OVERLAP_PER_FILE=2
+SECONDS_PER_FILE=3600
+OVERLAP_PER_FILE=60
 
 PIDFILE_BASE=/tmp/wget_script.$RANDOM.pids
 if [ -z "$NAME" ]; then
 	NAME=0
 fi
-CAPTURE_DIR="$( dirname "${BASH_SOURCE[0]}" )/capture"
+SCRIPT_DIR="$( cd $( dirname "${BASH_SOURCE[0]}" ); pwd )/"
+CAPTURE_DIR="${SCRIPT_DIR}/capture/"
 mkdir -p $CAPTURE_DIR
 cd $CAPTURE_DIR
+#OUT_FILE_TYPE="mjpeg"
+OUT_FILE_TYPE="avi"
 
 SHUTDOWN_IN_PROGRESS="false"
 quit() {
@@ -35,18 +38,19 @@ trap 'quit 0' SIGINT SIGTERM EXIT
 do_record() {
 	for i in $CAMERAS; do
 		echo "starting recording for camera $i" >&2
-		OUTFILE_START=tmp_dump_cam_${i}_$(date +%s.%N)_RANDOM$RANDOM.mjpg
+		OUTFILE_START=tmp_dump_cam_${i}_$(date +%s.%N)_RANDOM$RANDOM.$OUT_FILE_TYPE
 		( 
 			EXACT_START_TIME=$(date +%s.%N)
 			outfile_close_trap() {
 				echo "finishing capture file for camera $i"
 				EXACT_END_TIME=$(date +%s.%N)
 				if [ -f $OUTFILE_START ]; then
-					mv $OUTFILE_START dump_cam_${i}_${EXACT_START_TIME}_${EXACT_END_TIME}.mjpg
+					mv $OUTFILE_START dump_cam_${i}_${EXACT_START_TIME}_${EXACT_END_TIME}.$OUT_FILE_TYPE
 				fi
 			}
 			trap outfile_close_trap SIGINT SIGTERM EXIT
-			wget --ignore-length --http-user=$USERNAME --http-passwd=$PASSWORD  http://${SERVER_IP}:$PORT/cam/$i/stream.mjpeg -O $OUTFILE_START -q 2>&1 >> /dev/null &
+			#wget --ignore-length --http-user=$USERNAME --http-passwd=$PASSWORD  http://${SERVER_IP}:$PORT/cam/$i/stream.mjpeg -O $OUTFILE_START -q >> /dev/null 2>&1 &
+			${SCRIPT_DIR}/ffmpeg -use_wallclock_as_timestamps 1 -f mjpeg -i http://$USERNAME:$PASSWORD@${SERVER_IP}:$PORT:8080/cam/$i/stream.mjpeg -c copy -ts abs -y $OUTFILE_START >> /dev/null 2>&1 &
 			THIS_WGET_PID=$!
 			echo $THIS_WGET_PID >> ${PIDFILE_BASE}_${1}
 			wait $THIS_WGET_PID