Neccesary changes to make the different filters compatible with Kuren…

…to version 6.4
VTOOLS-FOSS · Mar 1, 2016 · c9f8fde · c9f8fde
1 parent 32ce933
commit c9f8fde
Show file tree

Hide file tree

Showing 58 changed files with 85 additions and 356 deletions.
diff --git a/apps/NuboEarJava/bower.json b/apps/NuboEarJava/bower.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "bootstrap": "~3.3.0",
     "ekko-lightbox": "~3.1.4",
-    "adapter.js": "*",
+    "adapter.js": "v0.2.9",
     "demo-console": "master"
   }
 }
diff --git a/apps/NuboEarJava/generate_zip.sh b/apps/NuboEarJava/generate_zip.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 APP_NAME=NuboEarJava
-VERSION=6.1.0
+VERSION=6.4.0
 DIR_INSTALL=apps_install
 MVN_CENTRAL=mvn_central
 

diff --git a/apps/NuboEarJava/generate_zip.sh.save b/apps/NuboEarJava/generate_zip.sh.save
diff --git a/apps/NuboEarJava/install/demo-startup.sh b/apps/NuboEarJava/install/demo-startup.sh
@@ -8,7 +8,7 @@ echo "Service [$APP_NAME] - [$1]"
 APP_HOME=/var/lib/kurento
 APP_NAME=nubo-ear-detector
 APP_JAR=NuboEarJava
-APP_VERSION=6.1.0
+APP_VERSION=6.4.0
 APP=$APP_NAME-$APP_VERSION
 APP_PORT=8104
 CONSOLE_LOG=/var/log/kurento-media-server/$APP_NAME.log

diff --git a/apps/NuboEarJava/pom.xml b/apps/NuboEarJava/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.visual-tools.nubomedia</groupId>
 		<artifactId>nubomedia-vca-parent-pom</artifactId>
-		<version>6.1.0</version>
+		<version>6.4.0</version>
 	</parent>
 
 	<artifactId>NuboEarJava</artifactId>
@@ -73,7 +73,7 @@
 		<dependency>
 			<groupId>com.visual-tools.nubomedia</groupId>
 			<artifactId>nuboeardetector</artifactId>
-			<version>0.0.5</version>
+			<version>6.4.0</version>
 		</dependency>
 	</dependencies>
 

diff --git a/apps/NuboEyeJava/bower.json b/apps/NuboEyeJava/bower.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "bootstrap": "~3.3.0",
     "ekko-lightbox": "~3.1.4",
-    "adapter.js": "*",
+    "adapter.js": "v0.2.9",
     "demo-console": "master"
   }
 }
diff --git a/apps/NuboEyeJava/generate_zip.sh b/apps/NuboEyeJava/generate_zip.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 APP_NAME=NuboEyeJava
-VERSION=6.1.0
+VERSION=6.4.0
 DIR_INSTALL=apps_install
 MVN_CENTRAL=mvn_central
 

diff --git a/apps/NuboEyeJava/install/demo-startup.sh b/apps/NuboEyeJava/install/demo-startup.sh
@@ -8,7 +8,7 @@ echo "Service [$APP_NAME] - [$1]"
 APP_HOME=/var/lib/kurento
 APP_NAME=nubo-eye-detector
 APP_JAR=NuboEyeJava
-APP_VERSION=6.1.0
+APP_VERSION=6.4.0
 APP=$APP_NAME-$APP_VERSION
 APP_PORT=8108
 CONSOLE_LOG=/var/log/kurento-media-server/$APP_NAME.log

diff --git a/apps/NuboEyeJava/pom.xml b/apps/NuboEyeJava/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.visual-tools.nubomedia</groupId>
 		<artifactId>nubomedia-vca-parent-pom</artifactId>
-		<version>6.1.0</version>
+		<version>6.4.0</version>
 	</parent>
 
 	<artifactId>NuboEyeJava</artifactId>
@@ -73,7 +73,7 @@
 		<dependency>
 			<groupId>com.visual-tools.nubomedia</groupId>
 			<artifactId>nuboeyedetector</artifactId>
-			<version>0.0.5</version>
+			<version>6.4.0</version>
 		</dependency>
 	</dependencies>
 

diff --git a/apps/NuboFaceJava/bower.json b/apps/NuboFaceJava/bower.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "bootstrap": "~3.3.0",
     "ekko-lightbox": "~3.1.4",
-    "adapter.js": "*",
+    "adapter.js": "v0.2.9",
     "demo-console": "1.5.1"
   }
 }
diff --git a/apps/NuboFaceJava/generate_zip.sh b/apps/NuboFaceJava/generate_zip.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 APP_NAME=NuboFaceJava
-VERSION=6.1.0
+VERSION=6.4.0
 DIR_INSTALL=apps_install
 MVN_CENTRAL=mvn_central
 

diff --git a/apps/NuboFaceJava/install/demo-startup.sh b/apps/NuboFaceJava/install/demo-startup.sh
@@ -8,7 +8,7 @@ echo "Service [$APP_NAME] - [$1]"
 APP_HOME=/var/lib/kurento
 APP_NAME=nubo-face-detector
 APP_JAR=NuboFaceJava
-APP_VERSION=6.1.0
+APP_VERSION=6.4.0
 APP=$APP_NAME-$APP_VERSION
 APP_PORT=8100
 CONSOLE_LOG=/var/log/kurento-media-server/$APP_NAME.log

diff --git a/apps/NuboFaceJava/pom.xml b/apps/NuboFaceJava/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.visual-tools.nubomedia</groupId>
 		<artifactId>nubomedia-vca-parent-pom</artifactId>		
-		<version>6.1.0</version>
+		<version>6.4.0</version>
 	</parent>
 
 	<artifactId>NuboFaceJava</artifactId>
@@ -71,7 +71,7 @@
 		<dependency>
 			<groupId>com.visual-tools.nubomedia</groupId>
 			<artifactId>nubofacedetector</artifactId>
-			<version>0.0.5</version>
+			<version>6.4.0</version>
 		</dependency>
 	</dependencies>
 

diff --git a/...boFaceJava/src/main/java/com/visual_tools/nubomedia/nuboFaceJava/NuboFaceJavaHandler.java b/...boFaceJava/src/main/java/com/visual_tools/nubomedia/nuboFaceJava/NuboFaceJavaHandler.java
@@ -87,8 +87,8 @@ public void handleTextMessage(WebSocketSession session, TextMessage message)
 	    setWidthToProcess(session,jsonMessage);
 	    break;	    
 	case "get_stats":			
-		getStats(session);
-		break;
+	    getStats(session);
+	    break;
 	case "euclidean_dis":
 		setEuclideanDistance(session,jsonMessage);
 		break;
@@ -120,6 +120,7 @@ public void handleTextMessage(WebSocketSession session, TextMessage message)
 	}
 
 	default:
+	    System.out.println("Error in handle text message....");
 	    sendError(session,
 		      "Invalid message with id "
 		      + jsonMessage.get("id").getAsString());
@@ -292,8 +293,9 @@ private void getStats(WebSocketSession session)
     {
 
     	try {
-    		Map<String,Stats> wr_stats= webRtcEndpoint.getStats();
-
+
+	    Map<String,Stats> wr_stats= webRtcEndpoint.getStats();
+
     		for (Stats s :  wr_stats.values()) {
 
     			switch (s.getType()) {		
@@ -303,8 +305,8 @@ private void getStats(WebSocketSession session)
 
     				JsonObject response = new JsonObject();
     				response.addProperty("id", "videoE2Elatency");
-    				response.addProperty("message", e2eVideLatency);				
-    				session.sendMessage(new TextMessage(response.toString()));				
+    				response.addProperty("message", e2eVideLatency);
+				session.sendMessage(new TextMessage(response.toString()));    	
     				break;
 
     			default:	

diff --git a/apps/NuboFaceJava/src/main/resources/static/js/index.js b/apps/NuboFaceJava/src/main/resources/static/js/index.js
@@ -46,6 +46,7 @@ ws.onmessage = function(message) {
 		break;
 	case 'videoE2Elatency':
 	    document.getElementById('testVideoE2Elatency').innerHTML= "  VideoE2ELatency (ms): " + parsedMessage.message;
+	    alert("Yes i am in videoE2Elatency value" + parsedMessage.message);
 	    break;
 	case 'iceCandidate':
 	    webRtcPeer.addIceCandidate(parsedMessage.candidate, function (error) {
@@ -236,7 +237,7 @@ function set_scale(value) {
 function show_latency()
 {
     if ( document.getElementById('videoE2Elatency').checked) {
-	timerId = setInterval(get_stats,1000);
+	timerId = setInterval(get_stats,3000);
     }
     else {
 	document.getElementById('testVideoE2Elatency').innerHTML = "  VideoE2ELatency (ms): ";
@@ -248,7 +249,7 @@ function get_stats()
 {
     var message = {
 	id : 'get_stats',
-	val: ''
+	val: '1'
     };
 
     sendMessage(message);

diff --git a/apps/NuboFaceProfileJava/generate_zip.sh b/apps/NuboFaceProfileJava/generate_zip.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 APP_NAME=NuboFaceProfileJava
-VERSION=6.1.0
+VERSION=6.4.0
 DIR_INSTALL=apps_install
 
 mkdir -p ../$DIR_INSTALL

diff --git a/apps/NuboFaceProfileJava/install/demo-startup.sh b/apps/NuboFaceProfileJava/install/demo-startup.sh
@@ -8,7 +8,7 @@ echo "Service [$APP_NAME] - [$1]"
 APP_HOME=/var/lib/kurento
 APP_NAME=nubo-face-profile-detector
 APP_JAR=NuboFaceProfileJava
-APP_VERSION=6.1.0-SNAPSHOT
+APP_VERSION=6.4.0
 APP=$APP_NAME-$APP_VERSION
 APP_PORT=8105
 CONSOLE_LOG=/var/log/kurento-media-server/$APP_NAME.log

diff --git a/apps/NuboFaceProfileJava/pom.xml b/apps/NuboFaceProfileJava/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.visual-tools.nubomedia</groupId>
 		<artifactId>nubomedia-vca-parent-pom</artifactId>
-		<version>6.1.0</version>
+		<version>6.4.0</version>
 	</parent>
 
 	<artifactId>NuboFaceProfileJava</artifactId>
@@ -72,22 +72,22 @@
 		<dependency>
 			<groupId>com.visual-tools.nubomedia</groupId>
 			<artifactId>nubofacedetector</artifactId>
-			<version>0.0.5</version>
+			<version>6.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.visual-tools.nubomedia</groupId>
 			<artifactId>nubomouthdetector</artifactId>
-			<version>0.0.5</version>
+			<version>6.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.visual-tools.nubomedia</groupId>
 			<artifactId>nubonosedetector</artifactId>
-			<version>0.0.5</version>
+			<version>6.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.visual-tools.nubomedia</groupId>
 			<artifactId>nuboeyedetector</artifactId>
-			<version>0.0.5</version>
+			<version>6.4.0</version>
 		</dependency>
 	</dependencies>
 

diff --git a/apps/NuboMouthJava/bower.json b/apps/NuboMouthJava/bower.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "bootstrap": "~3.3.0",
     "ekko-lightbox": "~3.1.4",
-    "adapter.js": "*",
+    "adapter.js": "v0.2.9",
     "demo-console": "master"
   }
 }
diff --git a/apps/NuboMouthJava/generate_zip.sh b/apps/NuboMouthJava/generate_zip.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 APP_NAME=NuboMouthJava
-VERSION=6.1.0
+VERSION=6.4.0
 DIR_INSTALL=apps_install
 MVN_CENTRAL=mvn_central
 

diff --git a/apps/NuboMouthJava/install/demo-startup.sh b/apps/NuboMouthJava/install/demo-startup.sh
@@ -8,7 +8,7 @@ echo "Service [$APP_NAME] - [$1]"
 APP_HOME=/var/lib/kurento
 APP_NAME=nubo-mouth-detector
 APP_JAR=NuboMouthJava
-APP_VERSION=6.1.0-SNAPSHOT
+APP_VERSION=6.4.0
 APP=$APP_NAME-$APP_VERSION
 APP_PORT=8103
 CONSOLE_LOG=/var/log/kurento-media-server/$APP_NAME.log

diff --git a/apps/NuboMouthJava/pom.xml b/apps/NuboMouthJava/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.visual-tools.nubomedia</groupId>
 		<artifactId>nubomedia-vca-parent-pom</artifactId>
-		<version>6.1.0</version>
+		<version>6.4.0</version>
 	</parent>
 
 	<artifactId>NuboMouthJava</artifactId>
@@ -71,7 +71,7 @@
 		<dependency>
 			<groupId>com.visual-tools.nubomedia</groupId>
 			<artifactId>nubomouthdetector</artifactId>
-			<version>0.0.5</version>
+			<version>6.4.0</version>
 		</dependency>
 	</dependencies>
 

diff --git a/apps/NuboNoseJava/bower.json b/apps/NuboNoseJava/bower.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "bootstrap": "~3.3.0",
     "ekko-lightbox": "~3.1.4",
-    "adapter.js": "*",
+    "adapter.js": "v0.2.9",
     "demo-console": "master"
   }
 }
diff --git a/apps/NuboNoseJava/generate_zip.sh b/apps/NuboNoseJava/generate_zip.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 APP_NAME=NuboNoseJava
-VERSION=6.1.0
+VERSION=6.4.0
 DIR_INSTALL=apps_install
 MVN_CENTRAL=mvn_central
 

diff --git a/apps/NuboNoseJava/install/demo-startup.sh b/apps/NuboNoseJava/install/demo-startup.sh
@@ -8,7 +8,7 @@ echo "Service [$APP_NAME] - [$1]"
 APP_HOME=/var/lib/kurento
 APP_NAME=nubo-nose-detector
 APP_JAR=NuboNoseJava
-APP_VERSION=6.1.0-SNAPSHOT
+APP_VERSION=6.4.0
 APP=$APP_NAME-$APP_VERSION
 APP_PORT=8102
 CONSOLE_LOG=/var/log/kurento-media-server/$APP_NAME.log

diff --git a/apps/NuboNoseJava/pom.xml b/apps/NuboNoseJava/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.visual-tools.nubomedia</groupId>
 		<artifactId>nubomedia-vca-parent-pom</artifactId>
-		<version>6.1.0</version>
+		<version>6.4.0</version>
 	</parent>
 
 	<artifactId>NuboNoseJava</artifactId>
@@ -70,7 +70,7 @@
 		<dependency>
 			<groupId>com.visual-tools.nubomedia</groupId>
 			<artifactId>nubonosedetector</artifactId>
-			<version>0.0.5</version>
+			<version>6.4.0</version>
 		</dependency>
 	</dependencies>
 

diff --git a/apps/NuboTrackerJava/bower.json b/apps/NuboTrackerJava/bower.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "bootstrap": "~3.3.0",
     "ekko-lightbox": "~3.1.4",
-    "adapter.js": "*",
+    "adapter.js": "v0.2.9",
     "demo-console": "master"
   }
 }
diff --git a/apps/NuboTrackerJava/generate_zip.sh b/apps/NuboTrackerJava/generate_zip.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 APP_NAME=NuboTrackerJava
-VERSION=6.1.0
+VERSION=6.4.0
 DIR_INSTALL=apps_install
 MVN_CENTRAL=mvn_central
 

diff --git a/apps/NuboTrackerJava/install/demo-startup.sh b/apps/NuboTrackerJava/install/demo-startup.sh
@@ -8,7 +8,7 @@ echo "Service [$APP_NAME] - [$1]"
 APP_HOME=/var/lib/kurento
 APP_NAME=nubo-tracker
 APP_JAR=NuboTrackerJava
-APP_VERSION=6.1.0
+APP_VERSION=6.4.0
 APP=$APP_NAME-$APP_VERSION
 APP_PORT=8107
 CONSOLE_LOG=/var/log/kurento-media-server/$APP_NAME.log