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 b7d0af31730761be7356ca661687e73e7cf8836f..c468109bfe168ff8de383d7d24b3b0be186b2cec 100755 (executable)
--- a/build/run-pipeline.sh
+++ b/build/run-pipeline.sh
@@ -18,16 +18,16 @@ BUILD=`basename $PWD`
 
 trap '$WRAPPER kill $STREAMER_PID' EXIT
 
-logapp --dumbterm=true --logtime=true --logfile=streamer.$TOTAL-$NUM.log \
+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 &
+> /dev/null 2>&1 &
 STREAMER_PID=$!
 
 sleep 0.5
 
 scp sdp$NUM.txt glab:frescor/demo/$BUILD
 
-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 #-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"; }'