From 99b74649dbbcef2e11302237fbc7e76e5b044e79 Mon Sep 17 00:00:00 2001 From: Victor Hidalgo Date: Wed, 13 Apr 2016 11:53:31 +0200 Subject: [PATCH] changes to solve minor problems in the release --- apps/NuboFaceProfileJava/pom.xml | 8 ++--- .../NuboFaceProfileJavaHandler.java | 34 +++++++++---------- .../src/gst-plugins/kmsfacedetect.cpp | 4 +-- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/apps/NuboFaceProfileJava/pom.xml b/apps/NuboFaceProfileJava/pom.xml index df54e4f..b7ae4ba 100644 --- a/apps/NuboFaceProfileJava/pom.xml +++ b/apps/NuboFaceProfileJava/pom.xml @@ -76,25 +76,25 @@ com.visual-tools.nubomedia nubofacedetector - 6.4.0 + 6.4.01 com.visual-tools.nubomedia nubomouthdetector - 6.4.0 + 6.4.01 com.visual-tools.nubomedia nubonosedetector - 6.4.0 + 6.4.01 com.visual-tools.nubomedia nuboeyedetector - 6.4.0 + 6.4.01 diff --git a/apps/NuboFaceProfileJava/src/main/java/com/vtools/nubomedia/nuboFaceProfileJava/NuboFaceProfileJavaHandler.java b/apps/NuboFaceProfileJava/src/main/java/com/vtools/nubomedia/nuboFaceProfileJava/NuboFaceProfileJavaHandler.java index 222c127..e91409a 100644 --- a/apps/NuboFaceProfileJava/src/main/java/com/vtools/nubomedia/nuboFaceProfileJava/NuboFaceProfileJavaHandler.java +++ b/apps/NuboFaceProfileJava/src/main/java/com/vtools/nubomedia/nuboFaceProfileJava/NuboFaceProfileJavaHandler.java @@ -158,7 +158,7 @@ public void onEvent(OnIceCandidateEvent event) { } }); - /******** Media Logic ********/ + /******** Media Logic ********/ face = new NuboFaceDetector.Builder(user.getMediaPipeline()).build(); face.sendMetaData(1); face.detectByEvent(0); @@ -337,24 +337,24 @@ private void getStats(WebSocketSession session) { try { - Map wr_stats= webRtcEndpoint.getStats(); + Map wr_stats= webRtcEndpoint.getStats(); - for (Stats s : wr_stats.values()) { - - switch (s.getType()) { - case endpoint: - EndpointStats end_stats= (EndpointStats) s; - double e2eVideLatency= end_stats.getVideoE2ELatency() / 1000000; + for (Stats s : wr_stats.values()) { + switch (s.getType()) { + + case endpoint: + EndpointStats end_stats= (EndpointStats) s; + double e2eVideLatency= end_stats.getVideoE2ELatency() / 1000000; - JsonObject response = new JsonObject(); - response.addProperty("id", "videoE2Elatency"); - response.addProperty("message", e2eVideLatency); - sendMessage(session,new TextMessage(response.toString())); - break; - default: - break; - } - } + JsonObject response = new JsonObject(); + response.addProperty("id", "videoE2Elatency"); + response.addProperty("message", e2eVideLatency); + sendMessage(session,new TextMessage(response.toString())); + break; + default: + break; + } + } } catch (Throwable t) { log.error("Exception getting stats...", t); } diff --git a/modules/nubo_face/nubo-face-detector/src/gst-plugins/kmsfacedetect.cpp b/modules/nubo_face/nubo-face-detector/src/gst-plugins/kmsfacedetect.cpp index 5602145..559dac1 100644 --- a/modules/nubo_face/nubo-face-detector/src/gst-plugins/kmsfacedetect.cpp +++ b/modules/nubo_face/nubo-face-detector/src/gst-plugins/kmsfacedetect.cpp @@ -516,10 +516,10 @@ static bool __receive_event(KmsFaceDetect *face_detect, GstVideoFrame *frame) } //Uncomment the following line to use the metadata - /*res = __get_event_message(metadata->data); + /*res = __get_event_message(metadata->data); */ if (res) - face_detect->priv->num_frames_to_process = NUM_FRAMES_TO_PROCESS;*/ + face_detect->priv->num_frames_to_process = NUM_FRAMES_TO_PROCESS; return res;