Merge branch 'master' of rtime.felk.cvut.cz:frescor/demo

[frescor/demo.git] / build / run-pipeline.sh

diff --git a/build/run-pipeline.sh b/build/run-pipeline.sh
index 8f27502f6eef122b2c8d07a0fbcd92d4fcb048b1..c468109bfe168ff8de383d7d24b3b0be186b2cec 100755 (executable)
--- a/build/run-pipeline.sh
+++ b/build/run-pipeline.sh
@@ -5,27 +5,29 @@ die() { set +x; echo $1; exit 1; }
 set -e
 set -x
 NUM=$1
+TOTAL=$2
 export NUM
 
 [ -z "$NUM" ] && die 'No number specified as $1'
 
-# Use contract broker running at the second computer (glab)
-export FCB_ADDR=192.168.1.10
+# Use contract broker running at the second computer (glab, eth connection)
+export FCB_ADDR=147.32.86.65
 
 BUILD=`basename $PWD`
-#[ "$BUILD" = "build" ] && WRAPPER="sudo chrt -f 50"
+[ "$BUILD" = "build" ] && WRAPPER="sudo -E chrt -f 50"
 
 trap '$WRAPPER kill $STREAMER_PID' EXIT
 
-$WRAPPER ./_compiled/bin/streamer -d /dev/video$NUM -s sdp$NUM.txt \
-                        -m 192.168.1.10 -p $((20000+2*$NUM)) \
-> /dev/null &
+logapp --logtime=true --logfile=streamer.$TOTAL-$NUM.log \
+    $WRAPPER ./_compiled/bin/streamer -d /dev/video$NUM -s sdp$NUM.txt \
+        -m 192.168.1.10 -p $((20000+2*$NUM)) \
+> /dev/null 2>&1 &
 STREAMER_PID=$!
 
 sleep 0.5
 
 scp sdp$NUM.txt glab:frescor/demo/$BUILD
 
-ssh -t glab "cd frescor/demo/$BUILD; sudo ./_compiled/bin/recorder -i sdp$NUM.txt -y -vframes 500 stream$NUM.mp4 #-renegotiate $((NUM*100))" 2>&1 \
+ssh -t glab "cd frescor/demo/$BUILD; logapp --logtime=true --logfile=recorder.$TOTAL-$NUM.log sudo ./_compiled/bin/recorder -direct -i sdp$NUM.txt -y -vframes 500 stream$NUM.mp4" 2>&1 \
 | perl -ne '$result=$_ if m/interframe interval/;
                    END { open FILE, ">", "result-rec-$ENV{q{NUM}}"; print FILE "$result\n"; }'