From 2209f089b39c43c06d027b7bfa8ad9b51396c378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kilian=20K=C3=B6ppchen?= <kiliankoeppchen@googlemail.com>
Date: Sat, 28 Mar 2015 15:07:21 +0100
Subject: [PATCH] Add code to test sent and received FPS

---
 Uebertragung/WebApp/js/helper.js              |  1 -
 Uebertragung/WebApp/network-facade.js         | 12 +++++-
 Uebertragung/WebApp/video.html                |  9 ++++-
 .../ApplicationServer/WebSocketServer.cpp     | 12 +++++-
 .../ApplicationServer/WebSocketServer.h       | 37 +++++++++++++++++--
 5 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/Uebertragung/WebApp/js/helper.js b/Uebertragung/WebApp/js/helper.js
index 389c15d..503ccb0 100644
--- a/Uebertragung/WebApp/js/helper.js
+++ b/Uebertragung/WebApp/js/helper.js
@@ -42,7 +42,6 @@ var calcOptimalSize = function(width, height, maxWidth, upscale=false) {
 			new_height = (height * ratio);
 		}
 	}
-	console.log("optimal size: " + new_width + " x " + new_height);
 	return [new_width, new_height];
 };
 
diff --git a/Uebertragung/WebApp/network-facade.js b/Uebertragung/WebApp/network-facade.js
index 470e38d..1ede4f7 100644
--- a/Uebertragung/WebApp/network-facade.js
+++ b/Uebertragung/WebApp/network-facade.js
@@ -23,6 +23,9 @@ var NetworkFacade = function (protocol) {
 		console.log('NetworkFacade does not support protocol type ' + this.protocol);
 	}
 	this.streamingVideo = null;
+	this.counter = 0;
+	this.start = null;
+	this.stop = null;
 };
 
 NetworkFacade.prototype.init = function(server, localName) {
@@ -77,12 +80,17 @@ NetworkFacade.prototype.startStreamVideo = function(video_source, width) {
 		var canvas = document.createElement("canvas");
 		canvas.setAttribute("type", "hidden");
 		var nwf = this;
+		this.start = performance.now();
 		this.streamingVideo = setInterval(function(){
+			var start = performance.now();
 			drawPictureToCanvas(video_source, video_source.videoWidth, video_source.videoHeight, canvas, width);
 			_image_data = canvas.toDataURL("image/jpeg");
 			_image_data = _image_data.replace(/^data:image\/jpeg;base64,/ig, "");
 			nwf.sendData(getXMLforPicture(canvas.width, canvas.height, _image_data));
-		}, 50);
+			var stop = performance.now();
+			console.log(stop - start);
+			nwf.counter += 1;
+		}, 0);
 		return true;
 	}
 	else {
@@ -97,7 +105,9 @@ NetworkFacade.prototype.stopStreamVideo = function(e) {
 		hangUpFromHere();
 	}
 	else if(this.protocol == "WebSocket") {
+		this.stop = performance.now();
 		clearInterval(this.streamingVideo);
+		console.log(this.stop - this.start + "ms" + " counter: " + this.counter);
 	}
 	else {
 		// do nothing
diff --git a/Uebertragung/WebApp/video.html b/Uebertragung/WebApp/video.html
index a3dd94e..4e4b07a 100644
--- a/Uebertragung/WebApp/video.html
+++ b/Uebertragung/WebApp/video.html
@@ -22,7 +22,12 @@
 			navigator.getUserMedia (
 				// constraints
 				{
-					video: true,
+					  video: {
+						mandatory: {
+							maxWidth: 1280,
+							maxHeight: 720,
+						}
+					},
 					audio: false
 				},
 
@@ -68,7 +73,7 @@
 		}
 	</script>
 	<div id="content_container">
-		<video id="video_tag">
+		<video id="video_tag" height="480" width="640">
 			Your browser does not support the video tag.
 		</video>
 		<button id="start_stream" onclick="toggleStartButton(nwF);">Start stream</button>
diff --git a/Visualisierung/ApplicationServer/WebSocketServer.cpp b/Visualisierung/ApplicationServer/WebSocketServer.cpp
index cee12d7..fce4411 100644
--- a/Visualisierung/ApplicationServer/WebSocketServer.cpp
+++ b/Visualisierung/ApplicationServer/WebSocketServer.cpp
@@ -10,6 +10,16 @@ unsigned int position = 0;
 char* recv_buffer = new char[104857600]; // 100 MB Buffer.
 char* xml_string = new char[1];
 
+struct timeval compareTime = (struct timeval){ 0 };
+struct timeval startTime;
+struct timeval endTime;
+struct timeval oldTime;
+struct timeval currTime;
+struct timeval resTime;
+struct timeval allTime;
+int counter = 0;
+
+
 WebSocketServer::WebSocketServer(){
 	init();
 }
@@ -36,7 +46,7 @@ int WebSocketServer::init() {
 }
 
 int WebSocketServer::run() {
-	return libwebsocket_service(context, 100);
+	return libwebsocket_service(context, 1);
 }
 
 void WebSocketServer::destroy() {
diff --git a/Visualisierung/ApplicationServer/WebSocketServer.h b/Visualisierung/ApplicationServer/WebSocketServer.h
index 877e04b..dd98915 100644
--- a/Visualisierung/ApplicationServer/WebSocketServer.h
+++ b/Visualisierung/ApplicationServer/WebSocketServer.h
@@ -6,12 +6,24 @@
 
 #include "MonkeyMediaProcessor.h"
 #include <iostream>
+#include <sys/time.h>
+#include <stdio.h>
+#include <unistd.h>
 
 extern MonkeyMediaProcessor* mmp;
 extern unsigned int position;
 extern char* recv_buffer;
 extern char* xml_string;
 
+extern struct timeval compareTime;
+extern struct timeval startTime;
+extern struct timeval endTime;
+extern struct timeval oldTime;
+extern struct timeval currTime;
+extern struct timeval resTime;
+extern struct timeval allTime;
+extern int counter;
+
 using namespace std;
 
 class WebSocketServer {
@@ -59,9 +71,16 @@ static int callback_save_data(	struct libwebsocket_context * that,
 			if (remaining == 0)
 			{
 				#if DEBUG
-					cout << "Done receiving data. Got " << position << " Bytes." << endl;
+					cout <<  position << " : ";
 				#endif
-
+					
+				if(!timercmp(&compareTime, &startTime, !=))
+				{
+					cout << "foo" << endl;
+					gettimeofday(&startTime, NULL);
+				}
+				
+				/*
 				// Delete last XML File and allocate new Memeory for new File.
 				delete [] xml_string;
 				xml_string = new char[position];
@@ -72,8 +91,20 @@ static int callback_save_data(	struct libwebsocket_context * that,
 				// Process the XML File and send Results to RCs.
 				mmp->process_monkey_data(xml_string, position);
 				mmp->send_to_renderers();
-
+				*/
+				
+				gettimeofday(&currTime, NULL);
+				gettimeofday(&endTime, NULL);
+				timersub(&currTime, &oldTime, &resTime);
+				printf("%ld.%06ld\n", (long int)resTime.tv_sec, (long int)resTime.tv_usec);
+				oldTime = currTime;
+				
 				position = 0; // Reset position.
+				counter++;
+				if (counter == 200 || counter == 400) {
+					timersub(&endTime, &startTime, &allTime);
+					printf("200 Entries: %ld.%06ld\n", (long int)allTime.tv_sec, (long int)allTime.tv_usec);
+				}
 			}
 			break;
 		}