Update opentera-webrtc (#76)

introlab · Jan 16, 2024 · 5f71959 · 5f71959
1 parent cab1c55
commit 5f71959
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 22 deletions.
diff --git a/face_cropping/src/TorchFaceDetector.cpp b/face_cropping/src/TorchFaceDetector.cpp
@@ -127,7 +127,7 @@ SmallYunet025Silu160FaceDetector::SmallYunet025Silu160FaceDetector(bool useGpuIf
           useGpuIfAvailable,
           160,
           160,
-          0.3,
+          0.2,
           0.3,
           getPackagePath() + MODEL_SUBPATH)
 {
@@ -138,7 +138,7 @@ SmallYunet025Silu320FaceDetector::SmallYunet025Silu320FaceDetector(bool useGpuIf
           useGpuIfAvailable,
           320,
           320,
-          0.4,
+          0.3,
           0.3,
           getPackagePath() + MODEL_SUBPATH)
 {
@@ -149,7 +149,7 @@ SmallYunet025Silu640FaceDetector::SmallYunet025Silu640FaceDetector(bool useGpuIf
           useGpuIfAvailable,
           640,
           640,
-          0.4,
+          0.3,
           0.3,
           getPackagePath() + MODEL_SUBPATH)
 {
@@ -161,7 +161,7 @@ SmallYunet05Silu160FaceDetector::SmallYunet05Silu160FaceDetector(bool useGpuIfAv
           useGpuIfAvailable,
           160,
           160,
-          0.4,
+          0.3,
           0.3,
           getPackagePath() + MODEL_SUBPATH)
 {
@@ -172,7 +172,7 @@ SmallYunet05Silu320FaceDetector::SmallYunet05Silu320FaceDetector(bool useGpuIfAv
           useGpuIfAvailable,
           320,
           320,
-          0.4,
+          0.3,
           0.3,
           getPackagePath() + MODEL_SUBPATH)
 {
@@ -183,7 +183,7 @@ SmallYunet05Silu640FaceDetector::SmallYunet05Silu640FaceDetector(bool useGpuIfAv
           useGpuIfAvailable,
           640,
           640,
-          0.4,
+          0.3,
           0.3,
           getPackagePath() + MODEL_SUBPATH)
 {

diff --git a/opentera_webrtc_demos/opentera-webrtc-teleop-frontend b/opentera_webrtc_demos/opentera-webrtc-teleop-frontend
diff --git a/opentera_webrtc_ros/CMakeLists.txt b/opentera_webrtc_ros/CMakeLists.txt
@@ -91,20 +91,6 @@ set(OPENTERA_WEBRTC_NATIVE_CLIENT_PYTHON_VERSION "${OPENTERA_WEBRTC_ROS_PYTHON_V
 add_subdirectory(opentera-webrtc)
 
 catkin_package(
-    INCLUDE_DIRS
-        ${webrtc_native_INCLUDE}
-        ${boringssl_INCLUDE}
-        ${CMAKE_CURRENT_SOURCE_DIR}/opentera-webrtc/opentera-webrtc-native-client/OpenteraWebrtcNativeClient/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/opentera-webrtc/opentera-webrtc-native-client/3rdParty
-        ${CMAKE_CURRENT_SOURCE_DIR}/opentera-webrtc/opentera-webrtc-native-client/3rdParty/json/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/opentera-webrtc/opentera-webrtc-native-client/3rdParty/cpp-httplib
-    LIBRARIES
-        opencv_core
-        opencv_imgproc
-        OpenteraWebrtcNativeClient
-        OpenteraWebrtcNativeGStreamer
-        ${webrtc_native_LIBRARY}
-        ${boringssl_LIBRARY}
     CATKIN_DEPENDS message_runtime
 )
 

diff --git a/opentera_webrtc_ros/opentera-webrtc b/opentera_webrtc_ros/opentera-webrtc
+1 −1		teleop-vue/src/components/DeviceSettings/DeviceSettings.vue
+4 −4		teleop-vue/src/store/modules/opentera/signalingClientStore.ts
+1 −1		teleop-vue/submodules/opentera-webrtc
+1 −1		VERSION
+1 −0		signaling-server/CMakeLists.txt
+8 −0		signaling-server/opentera_webrtc/signaling_server/signaling_server.py