diff --git a/Application/src/commons/common/gui/IMGUIBase.cpp b/Application/src/commons/common/gui/IMGUIBase.cpp index c6ba148bf68323c01b7560ea191007638d5d038a..8af45b0db7929a0f09c58ae799819c5bdd4e302c 100644 --- a/Application/src/commons/common/gui/IMGUIBase.cpp +++ b/Application/src/commons/common/gui/IMGUIBase.cpp @@ -130,7 +130,6 @@ void clear_cache() { #ifndef NDEBUG if(_texture) { - std::lock_guard<std::mutex> guard(_texture_mutex); auto it = all_gpu_texture.find(_texture->ptr); if(it != all_gpu_texture.end()) { all_gpu_texture.erase(it); @@ -143,7 +142,6 @@ void clear_cache() { #ifndef NDEBUG if(_texture) { - std::lock_guard<std::mutex> guard(_texture_mutex); all_gpu_texture.insert(_texture->ptr); } #endif diff --git a/Application/src/grabber/CMakeLists.txt b/Application/src/grabber/CMakeLists.txt index 7b1f0ab20521bdec8e01816cdb4e5508b150bb13..9c24bd89ab8ce09618ae626cea4e6ad9a45f3a9c 100644 --- a/Application/src/grabber/CMakeLists.txt +++ b/Application/src/grabber/CMakeLists.txt @@ -213,7 +213,7 @@ set(targets ${TGRABS_EXEC_NAME} pvinfo pvconvert) if(APPLE) add_executable(tgrabs_starter tgrabs.cpp) - target_link_libraries(tgrabs_starter PRIVATE cpputils) + target_link_libraries(tgrabs_starter PRIVATE commons cnpy) set_target_properties(tgrabs_starter PROPERTIES OUTPUT_NAME tgrabs) set(targets ${targets} tgrabs_starter) target_compile_definitions(tgrabs_starter PRIVATE TREX_PYTHON_PATH="${CONDA_PREFIX_VAR}") diff --git a/Application/src/grabber/tgrabs.cpp b/Application/src/grabber/tgrabs.cpp index ec6c57891812608b14370efcdfa8f12ea6ac462b..8fe4edbe351b80474e1532c8007a89b4c6df0da1 100644 --- a/Application/src/grabber/tgrabs.cpp +++ b/Application/src/grabber/tgrabs.cpp @@ -2,7 +2,10 @@ #include <cstdio> #include <string> #include <sstream> + +#define LIBCNPY_H_ #include <cpputils/cpputils.h> +#include <file/Path.h> #if WIN32 #define OS_SEP '\\' diff --git a/docs/contents.rst b/docs/contents.rst index 24088f90fdc07f9fddbf8cdb9ab41c5c329d5017..7789dc9340b81b794ed517a16b5a8bcd59491ecc 100644 --- a/docs/contents.rst +++ b/docs/contents.rst @@ -28,6 +28,16 @@ Overview * **TGrabs**: Record or convert existing videos, perform live-tracking and closed-loop experiments * **TRex**: Track converted videos (in PV format), use the automatic visual recognition, explore the data with visual helpers, export task-specific data, and adapt tracking parameters to specific use-cases +.. raw:: html + + <div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;"> + <video autoplay muted loop playsinline id="myVideo"> + <source src="composite_tracking_video.webm" type='video/webm; codecs="vp9"' /> + <source src="composite_tracking_video_.mp4" type='video/mp4; codecs="avc1"'> + <source src="composite_tracking_video.mov" type='video/mp4; codecs="h264"' /> + </video> + </div> + |grabs| always has to be used first. |trex| is optional in some cases. Use-cases where |trex| is not required include: * *Just give me tracks*: The user has a video and wants positional, or posture-related data for the individuals seen in the video. Maintaining identities is not required.