diff --git a/face_cropping/src/TorchFaceDetector.cpp b/face_cropping/src/TorchFaceDetector.cpp index aa8c888..c4c495f 100644 --- 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 index b5d94a2..88dad9a 160000 --- a/opentera_webrtc_demos/opentera-webrtc-teleop-frontend +++ b/opentera_webrtc_demos/opentera-webrtc-teleop-frontend @@ -1 +1 @@ -Subproject commit b5d94a2d9b8749a178bc66eebfcf9ca0d222a624 +Subproject commit 88dad9a8531350a26784754c4eca5ab00b7ca548 diff --git a/opentera_webrtc_ros/CMakeLists.txt b/opentera_webrtc_ros/CMakeLists.txt index 6d76220..404baec 100644 --- 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 index 6358ab6..ba08492 160000 --- a/opentera_webrtc_ros/opentera-webrtc +++ b/opentera_webrtc_ros/opentera-webrtc @@ -1 +1 @@ -Subproject commit 6358ab601b54ea29394279806e4ad5dc6933de03 +Subproject commit ba084927301b89bac4690bc9cb24af334f0cbac9