Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • nicolaspope/ftl
1 result
Show changes
Commits on Source (265)
165 additional commits have been omitted to prevent performance issues.
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 312 additions and 1677 deletions
.gitlab-ci.yml
View file @ 70063e8d
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
CMAKE_ARGS_WINDOWS: '-DCMAKE_GENERATOR_PLATFORM=x64 -DPORTAUDIO_DIR="D:/Build/portaudio" -DNVPIPE_DIR="D:/Build/NvPipe" -DEigen3_DIR="C:/Program Files (x86)/Eigen3/share/eigen3/cmake" -DOpenCV_DIR="D:/Build/opencv-4.1.1" -DCUDA_TOOLKIT_ROOT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v10.1" -DWITH_OPENVR=TRUE -DOPENVR_DIR="D:/Build/OpenVRSDK" -DWITH_CERES=FALSE' CMAKE_ARGS_WINDOWS: '-DCMAKE_GENERATOR_PLATFORM=x64 -DCeres_DIR="C:/Program Files/Ceres" -DPORTAUDIO_INCLUDE_DIRS="C:/Build/src/portaudio/include" -DPORTAUDIO_LIBRARY="C:/Build/bin/portaudio/Release/portaudio_x64.lib" -DPYLON_DIR="C:/Program Files/Basler/pylon 6/Development" -DOpenCV_DIR="C:/Build/bin/opencv/install" -DCUDA_TOOLKIT_ROOT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v10.2" -DWITH_OPENVR=TRUE -DWITH_CERES=TRUE'
stages: stages:
- all - all
...@@ -20,6 +20,7 @@ linux: ...@@ -20,6 +20,7 @@ linux:
- linux - linux
variables: variables:
FTL_LIB: ../../build/SDK/C/libftl-dev.so FTL_LIB: ../../build/SDK/C/libftl-dev.so
LD_LIBRARY_PATH: /opt/pylon/lib/
# before_script: # before_script:
# - export DEBIAN_FRONTEND=noninteractive # - export DEBIAN_FRONTEND=noninteractive
# - apt-get update -qq && apt-get install -y -qq g++ cmake git # - apt-get update -qq && apt-get install -y -qq g++ cmake git
...@@ -27,8 +28,9 @@ linux: ...@@ -27,8 +28,9 @@ linux:
script: script:
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -DWITH_OPTFLOW=TRUE -DUSE_CPPCHECK=FALSE -DBUILD_CALIBRATION=TRUE -DWITH_CERES=TRUE -DCMAKE_BUILD_TYPE=Release - /snap/bin/cmake .. -GNinja -DCMAKE_CXX_FLAGS="-fdiagnostics-color" -DWITH_OPTFLOW=TRUE -DUSE_CPPCHECK=FALSE -DBUILD_CALIBRATION=TRUE -DWITH_CERES=TRUE -DCMAKE_BUILD_TYPE=Release -DCPACK_GENERATOR=DEB
- make - ninja
- ninja package
- ctest --output-on-failure - ctest --output-on-failure
- cd ../SDK/Python - cd ../SDK/Python
- python3 -m unittest discover test - python3 -m unittest discover test
...@@ -52,17 +54,15 @@ webserver-deploy: ...@@ -52,17 +54,15 @@ webserver-deploy:
### Windows ### Windows
.build-windows: &build-windows .build-windows: &build-windows
- 'call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvars64.bat"' - call vcvars64.bat
- mkdir build - mkdir build
- cd build - cd build
- echo cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DNANOGUI_DIR="C:/Program Files (x86)/NanoGUI" .. - cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DREALSENSE_DIR="C:/Program Files (x86)/Intel RealSense SDK 2.0" -DOPENVR_DIR="C:/Program Files (x86)/OpenVRSDK" -DOPUS_DIR="C:/Program Files (x86)/Opus" ..
- cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DREALSENSE_DIR="C:/Program Files (x86)/Intel RealSense SDK 2.0" -DNANOGUI_DIR="C:/Program Files (x86)/NanoGUI" ..
- devenv ftl.utu.fi.sln /build Release - devenv ftl.utu.fi.sln /build Release
- rmdir /q /s "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%" - rmdir /q /s "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%"
- mkdir "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%" - mkdir "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%"
- 'copy "applications\vision\Release\ftl-vision.exe" "%DEPLOY_DIR%\%CI_COMMIT_REF_SLUG%"' - 'copy "applications\vision\Release\ftl-vision.exe" "%DEPLOY_DIR%\%CI_COMMIT_REF_SLUG%"'
- 'copy "applications\calibration\Release\ftl-calibrate.exe" "%DEPLOY_DIR%\%CI_COMMIT_REF_SLUG%"' - 'copy "applications\gui2\Release\ftl-gui2.exe" "%DEPLOY_DIR%\%CI_COMMIT_REF_SLUG%"'
- 'copy "applications\gui\Release\ftl-gui.exe" "%DEPLOY_DIR%\%CI_COMMIT_REF_SLUG%"'
windows-vision: windows-vision:
except: except:
...@@ -70,7 +70,7 @@ windows-vision: ...@@ -70,7 +70,7 @@ windows-vision:
stage: all stage: all
variables: variables:
CMAKE_ARGS: '-DENABLE_PROFILER=TRUE -DWITH_OPTFLOW=TRUE -DBUILD_VISION=TRUE -DBUILD_CALIBRATION=FALSE -DBUILDRECONSTRUCT=FALSE -DBUILDRENDERER=FALSE -DBUILD_TESTING=FALSE -DBUILD_TESTS=FALSE' CMAKE_ARGS: '-DENABLE_PROFILER=TRUE -DWITH_OPTFLOW=TRUE -DBUILD_VISION=TRUE -DBUILD_CALIBRATION=FALSE -DBUILDRECONSTRUCT=FALSE -DBUILDRENDERER=FALSE -DBUILD_TESTING=FALSE -DBUILD_TESTS=FALSE'
DEPLOY_DIR: 'D:/Shared/AutoDeploy' DEPLOY_DIR: 'C:/Shared/AutoDeploy'
tags: tags:
- win - win
script: script:
...@@ -82,8 +82,11 @@ windows-master: ...@@ -82,8 +82,11 @@ windows-master:
stage: all stage: all
variables: variables:
CMAKE_ARGS: '-DWITH_OPTFLOW=TRUE' CMAKE_ARGS: '-DWITH_OPTFLOW=TRUE'
DEPLOY_DIR: 'D:/Shared/AutoDeploy' DEPLOY_DIR: 'C:/Shared/AutoDeploy'
tags: tags:
- win - win
script: script:
- *build-windows - *build-windows
# - set PATH=%PATH%;C:/Shared/Deploy
# - ctest --output-on-failure --timeout 60
CMakeLists.txt
View file @ 70063e8d
cmake_minimum_required (VERSION 3.1.0) cmake_minimum_required (VERSION 3.16.0)
include (CheckIncludeFile) include (CheckIncludeFile)
include (CheckIncludeFileCXX) include (CheckIncludeFileCXX)
include (CheckFunctionExists) include (CheckFunctionExists)
include(CheckLanguage) include(CheckLanguage)
if (WIN32)
set(CMAKE_GENERATOR_TOOLSET "host=x64")
endif()
project (ftl.utu.fi VERSION 0.0.4) project (ftl.utu.fi VERSION 0.0.4)
include(GNUInstallDirs) include(GNUInstallDirs)
include(CTest) include(CTest)
enable_testing() enable_testing()
option(WITH_NVPIPE "Use NvPipe for compression if available" ON)
option(WITH_OPTFLOW "Use NVIDIA Optical Flow if available" OFF) option(WITH_OPTFLOW "Use NVIDIA Optical Flow if available" OFF)
option(WITH_OPENVR "Build with OpenVR support" OFF) option(WITH_OPENVR "Build with OpenVR support" OFF)
option(WITH_OPUS "Use Opus audio compression" ON)
option(WITH_FIXSTARS "Use Fixstars libSGM" ON) option(WITH_FIXSTARS "Use Fixstars libSGM" ON)
option(WITH_CERES "Use Ceres solver" ON) option(WITH_CERES "Use Ceres solver" ON)
option(WITH_SDK "Build the C shared SDK" ON)
option(USE_CPPCHECK "Apply cppcheck during build" ON) option(USE_CPPCHECK "Apply cppcheck during build" ON)
option(BUILD_VISION "Enable the vision component" ON) option(BUILD_VISION "Enable the vision component" ON)
option(BUILD_RECONSTRUCT "Enable the reconstruction component" ON) option(BUILD_RECONSTRUCT "Enable the reconstruction component" ON)
option(BUILD_RENDERER "Enable the renderer component" ON) option(BUILD_RENDERER "Enable the renderer component" ON)
option(BUILD_GUI "Enable the GUI" ON) option(BUILD_GUI "Enable the GUI" ON)
option(BUILD_CALIBRATION "Enable the calibration component" OFF)
option(BUILD_TOOLS "Compile developer and research tools" ON) option(BUILD_TOOLS "Compile developer and research tools" ON)
option(BUILD_TESTS "Compile all unit and integration tests" ON) option(BUILD_TESTS "Compile all unit and integration tests" ON)
option(ENABLE_PROFILER "Enable builtin performance profiling" OFF) option(ENABLE_PROFILER "Enable builtin performance profiling" OFF)
...@@ -42,12 +47,18 @@ MACRO( VERSION_STR_TO_INTS major minor patch version ) ...@@ -42,12 +47,18 @@ MACRO( VERSION_STR_TO_INTS major minor patch version )
ENDMACRO( VERSION_STR_TO_INTS ) ENDMACRO( VERSION_STR_TO_INTS )
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CUDA_HOST_COMPILER gcc-7)
endif()
find_package( OpenCV REQUIRED COMPONENTS core imgproc highgui cudaimgproc calib3d imgcodecs videoio aruco cudaarithm cudastereo cudaoptflow face tracking quality xfeatures2d) find_package( OpenCV REQUIRED COMPONENTS core imgproc highgui cudaimgproc calib3d imgcodecs videoio aruco cudaarithm cudastereo cudaoptflow face tracking quality xfeatures2d)
find_package( Threads REQUIRED ) find_package( Threads REQUIRED )
find_package( URIParser REQUIRED ) find_package( URIParser REQUIRED )
find_package( MsgPack REQUIRED ) find_package( MsgPack REQUIRED )
find_package( Eigen3 REQUIRED ) find_package( Eigen3 REQUIRED )
find_package( Pylon )
VERSION_STR_TO_INTS(OPENCV_MAJOR OPENCV_MINOR OPENCV_PATCH ${OpenCV_VERSION}) VERSION_STR_TO_INTS(OPENCV_MAJOR OPENCV_MINOR OPENCV_PATCH ${OpenCV_VERSION})
math(EXPR OPENCV_NUMBER "(${OPENCV_MAJOR} * 10000) + (${OPENCV_MINOR} * 100) + ${OPENCV_PATCH}") math(EXPR OPENCV_NUMBER "(${OPENCV_MAJOR} * 10000) + (${OPENCV_MINOR} * 100) + ${OPENCV_PATCH}")
...@@ -113,35 +124,71 @@ else() ...@@ -113,35 +124,71 @@ else()
add_library(openvr INTERFACE) add_library(openvr INTERFACE)
endif() endif()
# ============== Opus ==========================================================
if (WITH_OPUS)
find_library( OPUS_LIBRARY NAMES opus PATHS ${OPUS_DIR} PATH_SUFFIXES lib)
if (OPUS_LIBRARY)
find_path( OPUS_INCLUDE NAMES opus/opus.h)
if (WIN32 OR OPUS_INCLUDE)
set(HAVE_OPUS TRUE)
add_library(Opus UNKNOWN IMPORTED)
#set_property(TARGET nanogui PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${NANOGUI_EXTRA_INCS})
set_property(TARGET Opus PROPERTY IMPORTED_LOCATION ${OPUS_LIBRARY})
message(STATUS "Found Opus: ${OPUS_LIBRARY}")
else()
message(STATUS "Opus headers not installed")
endif()
if(WIN32)
# Find include
find_path(OPUS_INCLUDE_DIRS
NAMES opus/opus.h
PATHS "C:/Program Files/Opus" "C:/Program Files (x86)/Opus" ${OPUS_DIR}
PATH_SUFFIXES include
)
set_property(TARGET Opus PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${OPUS_INCLUDE_DIRS})
endif()
else()
message(STATUS "No Opus, audio compression disabled")
set(OPUS_LIBRARY "")
add_library(Opus INTERFACE)
endif()
else()
set(OPUS_LIBRARY "")
add_library(Opus INTERFACE)
endif()
# ============================================================================== # ==============================================================================
add_subdirectory(lib/libstereo) add_subdirectory(lib/libstereo)
include_directories(lib/libstereo/include) include_directories(lib/libstereo/include)
set_property(TARGET libstereo PROPERTY FOLDER "dependencies") set_property(TARGET libstereo PROPERTY FOLDER "dependencies")
# # ==== Ceres ===================================================================
if (WITH_FIXSTARS)
set(HAVE_LIBSGM true)
add_subdirectory(lib/libsgm)
include_directories(lib/libsgm/include)
set_property(TARGET sgm PROPERTY FOLDER "dependencies")
else()
add_library(sgm INTERFACE)
endif()
if (WITH_CERES) if (WITH_CERES)
#find_package(glog QUIET)
find_package(Ceres REQUIRED) find_package(Ceres REQUIRED)
set(HAVE_CERES true) set(HAVE_CERES true)
if (WIN32)
# Hack to fix missing includes
set_property(TARGET ceres PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Ceres_DIR}/../include)
endif()
else() else()
add_library(ceres INTERFACE) add_library(ceres INTERFACE)
endif() endif()
# ==============================================================================
if(${CMAKE_VERSION} VERSION_GREATER "3.12.0") if(${CMAKE_VERSION} VERSION_GREATER "3.12.0")
cmake_policy(SET CMP0074 NEW) cmake_policy(SET CMP0074 NEW)
endif() endif()
set(CMAKE_CXX_STANDARD 17) # For PCL/VTK https://github.com/PointCloudLibrary/pcl/issues/2686 set(CMAKE_CXX_STANDARD 17)
set(HAVE_OPENCV TRUE) set(HAVE_OPENCV TRUE)
# Readline library is not required on Windows # Readline library is not required on Windows
...@@ -155,6 +202,8 @@ else() ...@@ -155,6 +202,8 @@ else()
endif() endif()
endif() endif()
# ==== Realsense ===============================================================
find_library( REALSENSE_LIBRARY NAMES realsense2 librealsense2 PATHS ${REALSENSE_DIR} PATH_SUFFIXES lib/x64) find_library( REALSENSE_LIBRARY NAMES realsense2 librealsense2 PATHS ${REALSENSE_DIR} PATH_SUFFIXES lib/x64)
if (REALSENSE_LIBRARY) if (REALSENSE_LIBRARY)
set(HAVE_REALSENSE TRUE) set(HAVE_REALSENSE TRUE)
...@@ -177,43 +226,7 @@ else() ...@@ -177,43 +226,7 @@ else()
add_library(realsense INTERFACE) add_library(realsense INTERFACE)
endif() endif()
if (BUILD_GUI) # ==== Portaudio v19 ===========================================================
set(HAVE_NANOGUI TRUE)
# Disable building extras we won't need (pure C++ project)
set(NANOGUI_BUILD_SHARED OFF CACHE BOOL " " FORCE)
set(NANOGUI_BUILD_EXAMPLE OFF CACHE BOOL " " FORCE)
set(NANOGUI_BUILD_PYTHON OFF CACHE BOOL " " FORCE)
set(NANOGUI_INSTALL OFF CACHE BOOL " " FORCE)
# Add the configurations from nanogui
add_subdirectory(ext/nanogui)
# For reliability of parallel build, make the NanoGUI targets dependencies
set_property(TARGET glfw glfw_objects nanogui PROPERTY FOLDER "dependencies")
endif()
find_library( NVPIPE_LIBRARY NAMES NvPipe libNvPipe PATHS ${NVPIPE_DIR} PATH_SUFFIXES lib)
if (NVPIPE_LIBRARY)
set(HAVE_NVPIPE TRUE)
add_library(nvpipe UNKNOWN IMPORTED)
#set_property(TARGET nanogui PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${NANOGUI_EXTRA_INCS})
set_property(TARGET nvpipe PROPERTY IMPORTED_LOCATION ${NVPIPE_LIBRARY})
message(STATUS "Found NvPipe: ${NVPIPE_LIBRARY}")
if(WIN32)
# Find include
find_path(NVPIPE_INCLUDE_DIRS
NAMES NvPipe.h
PATHS "C:/Program Files/NvPipe" "C:/Program Files (x86)/NvPipe" ${NVPIPE_DIR}
PATH_SUFFIXES include
)
set_property(TARGET nvpipe PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${NVPIPE_INCLUDE_DIRS})
endif()
else()
set(NVPIPE_LIBRARY "")
add_library(nvpipe INTERFACE)
endif()
# Portaudio v19 library # Portaudio v19 library
find_library( PORTAUDIO_LIBRARY NAMES portaudio PATHS ${PORTAUDIO_DIR} PATH_SUFFIXES lib) find_library( PORTAUDIO_LIBRARY NAMES portaudio PATHS ${PORTAUDIO_DIR} PATH_SUFFIXES lib)
...@@ -239,6 +252,8 @@ else() ...@@ -239,6 +252,8 @@ else()
message(WARNING "Portaudio not found - sound disabled") message(WARNING "Portaudio not found - sound disabled")
endif() endif()
# ==============================================================================
# Assimp library # Assimp library
#find_library( ASSIMP_LIBRARY NAMES assimp PATHS ${PORTAUDIO_DIR} PATH_SUFFIXES lib) #find_library( ASSIMP_LIBRARY NAMES assimp PATHS ${PORTAUDIO_DIR} PATH_SUFFIXES lib)
#if (ASSIMP_LIBRARY) #if (ASSIMP_LIBRARY)
...@@ -271,16 +286,22 @@ endif() ...@@ -271,16 +286,22 @@ endif()
check_language(CUDA) check_language(CUDA)
if (CUDA_TOOLKIT_ROOT_DIR) if (CUDA_TOOLKIT_ROOT_DIR)
enable_language(CUDA) enable_language(CUDA)
set(CMAKE_CUDA_FLAGS "-Xcompiler -fPIC")
if (NOT WIN32)
set(CMAKE_CUDA_FLAGS "-Xcompiler -fPIC")
endif()
set(CMAKE_CUDA_ARCHITECTURES 61)
set(CMAKE_CUDA_FLAGS_DEBUG "--gpu-architecture=compute_61 -g -DDEBUG -D_DEBUG") set(CMAKE_CUDA_FLAGS_DEBUG "--gpu-architecture=compute_61 -g -DDEBUG -D_DEBUG")
set(CMAKE_CUDA_FLAGS_RELEASE "--gpu-architecture=compute_61") set(CMAKE_CUDA_FLAGS_RELEASE "--gpu-architecture=compute_61")
set(HAVE_CUDA TRUE) set(HAVE_CUDA TRUE)
include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}) include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
# Some kind of fix for nvcc and -pthread problem on Linux # Some kind of fix for nvcc and -pthread problem on Linux
if (NOT WIN32)
set_property(TARGET Threads::Threads set_property(TARGET Threads::Threads
PROPERTY INTERFACE_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler -pthread> PROPERTY INTERFACE_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler -pthread>
"$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:-pthread>") "$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:-pthread>")
endif()
endif () endif ()
...@@ -354,23 +375,85 @@ include(ftl_paths) ...@@ -354,23 +375,85 @@ include(ftl_paths)
if (WIN32) # TODO(nick) Should do based upon compiler (VS) if (WIN32) # TODO(nick) Should do based upon compiler (VS)
add_definitions(-DWIN32) add_definitions(-DWIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17") set(CMAKE_GENERATOR_TOOLSET "host=x64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2 /MP4 /std:c++17 /wd4996")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /DFTL_DEBUG /Wall") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /DFTL_DEBUG /Wall")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /O2") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /O2")
set(OS_LIBS "") set(OS_LIBS "")
else() else()
add_definitions(-DUNIX) add_definitions(-DUNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fPIC -msse3 -Werror -Wall") # -fdiagnostics-color
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -pg") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fPIC -march=native -mfpmath=sse -Wall -Werror=unused-result -Werror=return-type")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -mfpmath=sse") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
set(OS_LIBS "dl") set(OS_LIBS "dl")
endif() endif()
SET(CMAKE_USE_RELATIVE_PATHS ON) SET(CMAKE_USE_RELATIVE_PATHS ON)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
# ==== NvPipe ==================================================================
#add_subdirectory(lib/nvpipe)
#find_library( NVPIPE_LIBRARY NAMES NvPipe libNvPipe PATHS ${NVPIPE_DIR} PATH_SUFFIXES lib)
#if (NVPIPE_LIBRARY)
set(HAVE_NVPIPE TRUE)
# add_library(nvpipe UNKNOWN IMPORTED)
#set_property(TARGET nanogui PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${NANOGUI_EXTRA_INCS})
# set_property(TARGET nvpipe PROPERTY IMPORTED_LOCATION ${NVPIPE_LIBRARY})
# message(STATUS "Found NvPipe: ${NVPIPE_LIBRARY}")
# if(WIN32)
# Find include
# find_path(NVPIPE_INCLUDE_DIRS
# NAMES NvPipe.h
# PATHS "C:/Program Files/NvPipe" "C:/Program Files (x86)/NvPipe" ${NVPIPE_DIR}
# PATH_SUFFIXES include
# )
# set_property(TARGET nvpipe PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${NVPIPE_INCLUDE_DIRS})
# endif()
#else()
# set(NVPIPE_LIBRARY "")
# add_library(nvpipe INTERFACE)
#endif()
if (WIN32)
add_library(nvidia-ml INTERFACE)
endif()
if (WITH_FIXSTARS)
set(HAVE_LIBSGM true)
add_subdirectory(lib/libsgm)
include_directories(lib/libsgm/include)
set_property(TARGET sgm PROPERTY FOLDER "dependencies")
else()
add_library(sgm INTERFACE)
endif()
# ==============================================================================
if (BUILD_GUI)
set(HAVE_NANOGUI TRUE)
# Disable building extras we won't need (pure C++ project)
set(NANOGUI_BUILD_SHARED OFF CACHE BOOL " " FORCE)
set(NANOGUI_BUILD_EXAMPLE OFF CACHE BOOL " " FORCE)
set(NANOGUI_BUILD_PYTHON OFF CACHE BOOL " " FORCE)
set(NANOGUI_INSTALL OFF CACHE BOOL " " FORCE)
set(NANOGUI_EIGEN_INCLUDE_DIR ${EIGEN_INCLUDE_DIR} CACHE STRING " " FORCE)
# Add the configurations from nanogui
add_subdirectory(ext/nanogui)
# For reliability of parallel build, make the NanoGUI targets dependencies
set_property(TARGET glfw glfw_objects nanogui PROPERTY FOLDER "dependencies")
endif()
# =============================================================================
add_subdirectory(components/common/cpp) add_subdirectory(components/common/cpp)
add_subdirectory(applications/calibration)
add_subdirectory(components/codecs) add_subdirectory(components/codecs)
add_subdirectory(components/structures) add_subdirectory(components/structures)
add_subdirectory(components/net) add_subdirectory(components/net)
...@@ -387,8 +470,10 @@ add_subdirectory(components/calibration) ...@@ -387,8 +470,10 @@ add_subdirectory(components/calibration)
add_subdirectory(applications/tools) add_subdirectory(applications/tools)
# SDK only compiles on linux currently # SDK only compiles on linux currently
if (NOT WIN32) if (WITH_SDK)
add_subdirectory(SDK/C) if (NOT WIN32)
add_subdirectory(SDK/C)
endif()
endif() endif()
if (HAVE_AVFORMAT) if (HAVE_AVFORMAT)
...@@ -404,23 +489,17 @@ if (BUILD_VISION) ...@@ -404,23 +489,17 @@ if (BUILD_VISION)
add_subdirectory(applications/vision) add_subdirectory(applications/vision)
endif() endif()
if (BUILD_CALIBRATION)
if (NOT HAVE_CERES)
message(ERROR "Ceres is required")
endif()
add_subdirectory(applications/calibration-ceres)
add_subdirectory(applications/calibration-multi)
endif()
if (BUILD_RECONSTRUCT) if (BUILD_RECONSTRUCT)
add_subdirectory(applications/reconstruct) add_subdirectory(applications/reconstruct2)
endif() endif()
if (HAVE_NANOGUI) if (HAVE_NANOGUI)
add_subdirectory(applications/gui) #add_subdirectory(applications/gui)
add_subdirectory(applications/gui2)
endif() endif()
add_subdirectory(applications/aruco)
### Generate Build Configuration Files ========================================= ### Generate Build Configuration Files =========================================
configure_file(${CMAKE_SOURCE_DIR}/components/common/cpp/include/ftl/config.h.in configure_file(${CMAKE_SOURCE_DIR}/components/common/cpp/include/ftl/config.h.in
...@@ -431,17 +510,9 @@ configure_file(${CMAKE_SOURCE_DIR}/components/common/cpp/src/config.cpp.in ...@@ -431,17 +510,9 @@ configure_file(${CMAKE_SOURCE_DIR}/components/common/cpp/src/config.cpp.in
${CMAKE_SOURCE_DIR}/components/common/cpp/src/config.cpp ${CMAKE_SOURCE_DIR}/components/common/cpp/src/config.cpp
) )
# For issue #17
# https://gitlab.kitware.com/cmake/cmake/issues/16915#note_456382
if ( TARGET Qt5::Core )
get_property( core_options TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_OPTIONS )
string( REPLACE "-fPIC" "" new_core_options "${core_options}" )
set_property( TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_OPTIONS ${new_core_options} )
set_property( TARGET Qt5::Core PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE "ON" )
set( CMAKE_CXX_COMPILE_OPTIONS_PIE "-fPIC" )
endif()
if (WIN32) # TODO(nick) Should do based upon compiler (VS) if (WIN32) # TODO(nick) Should do based upon compiler (VS)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${VS_STARTUP_PROJECT}) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${VS_STARTUP_PROJECT})
set_property(TARGET ftl-vision PROPERTY VS_DEBUGGER_WORKING_DIRECTORY ${VS_DEBUG_WORKING_DIRECTORY}) set_property(TARGET ftl-vision PROPERTY VS_DEBUGGER_WORKING_DIRECTORY ${VS_DEBUG_WORKING_DIRECTORY})
endif() endif()
include(ftl_CPack)
Doxyfile
View file @ 70063e8d
...@@ -441,7 +441,7 @@ EXTRACT_ALL = YES ...@@ -441,7 +441,7 @@ EXTRACT_ALL = YES
# be included in the documentation. # be included in the documentation.
# The default value is: NO. # The default value is: NO.
EXTRACT_PRIVATE = NO EXTRACT_PRIVATE = YES
# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
# scope will be included in the documentation. # scope will be included in the documentation.
...@@ -2306,7 +2306,7 @@ UML_LIMIT_NUM_FIELDS = 10 ...@@ -2306,7 +2306,7 @@ UML_LIMIT_NUM_FIELDS = 10
# The default value is: NO. # The default value is: NO.
# This tag requires that the tag HAVE_DOT is set to YES. # This tag requires that the tag HAVE_DOT is set to YES.
TEMPLATE_RELATIONS = NO TEMPLATE_RELATIONS = YES
# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to # If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
# YES then doxygen will generate a graph for each documented file showing the # YES then doxygen will generate a graph for each documented file showing the
......
SDK/C/src/streams.cpp
View file @ 70063e8d
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <ftl/operators/operator.hpp> #include <ftl/operators/operator.hpp>
#include <ftl/operators/disparity.hpp> #include <ftl/operators/disparity.hpp>
#include <ftl/operators/mvmls.hpp> #include <ftl/operators/mvmls.hpp>
#include <ftl/data/framepool.hpp>
#include <opencv2/imgproc.hpp> #include <opencv2/imgproc.hpp>
...@@ -18,6 +19,8 @@ static ftlError_t last_error = FTLERROR_OK; ...@@ -18,6 +19,8 @@ static ftlError_t last_error = FTLERROR_OK;
static ftl::Configurable *root = nullptr; static ftl::Configurable *root = nullptr;
struct FTLStream { struct FTLStream {
FTLStream() : pool(2,5) {}
bool readonly; bool readonly;
ftl::stream::Sender *sender; ftl::stream::Sender *sender;
ftl::stream::Stream *stream; ftl::stream::Stream *stream;
...@@ -27,8 +30,8 @@ struct FTLStream { ...@@ -27,8 +30,8 @@ struct FTLStream {
ftl::operators::Graph *pipelines; ftl::operators::Graph *pipelines;
std::vector<ftl::rgbd::FrameState> video_states; ftl::data::Pool pool;
ftl::rgbd::FrameSet video_fs; std::shared_ptr<ftl::rgbd::FrameSet> video_fs;
}; };
ftlError_t ftlGetLastStreamError(ftlStream_t stream) { ftlError_t ftlGetLastStreamError(ftlStream_t stream) {
...@@ -39,7 +42,7 @@ static void createFileWriteStream(FTLStream *s, const ftl::URI &uri) { ...@@ -39,7 +42,7 @@ static void createFileWriteStream(FTLStream *s, const ftl::URI &uri) {
if (!root) { if (!root) {
int argc = 1; int argc = 1;
const char *argv[] = {"SDK",0}; const char *argv[] = {"SDK",0};
root = ftl::configure(argc, const_cast<char**>(argv), "sdk_default"); root = ftl::configure(argc, const_cast<char**>(argv), "sdk_default", {});
} }
auto *fs = ftl::create<ftl::stream::File>(root, "ftlfile"); auto *fs = ftl::create<ftl::stream::File>(root, "ftlfile");
...@@ -62,12 +65,10 @@ ftlStream_t ftlCreateWriteStream(const char *uri) { ...@@ -62,12 +65,10 @@ ftlStream_t ftlCreateWriteStream(const char *uri) {
s->stream = nullptr; s->stream = nullptr;
s->sender = nullptr; s->sender = nullptr;
s->pipelines = nullptr; s->pipelines = nullptr;
s->video_fs.id = 0; s->video_fs = std::make_shared<ftl::data::FrameSet>(&s->pool, ftl::data::FrameID(0,0), ftl::timer::get_time());
s->video_fs.count = 0; s->video_fs->mask = 0;
s->video_fs.mask = 0;
s->interval = 40; s->interval = 40;
s->video_fs.frames.reserve(32); //s->video_fs->frames.reserve(32);
s->video_states.resize(32);
s->has_fresh_data = false; s->has_fresh_data = false;
switch (u.getScheme()) { switch (u.getScheme()) {
...@@ -87,7 +88,7 @@ ftlStream_t ftlCreateWriteStream(const char *uri) { ...@@ -87,7 +88,7 @@ ftlStream_t ftlCreateWriteStream(const char *uri) {
} }
last_error = FTLERROR_OK; last_error = FTLERROR_OK;
s->video_fs.timestamp = ftl::timer::get_time(); //s->video_fs.timestamp = ftl::timer::get_time();
return s; return s;
} }
...@@ -106,10 +107,10 @@ ftlError_t ftlImageWrite( ...@@ -106,10 +107,10 @@ ftlError_t ftlImageWrite(
return FTLERROR_STREAM_INVALID_PARAMETER; return FTLERROR_STREAM_INVALID_PARAMETER;
if (static_cast<int>(channel) < 0 || static_cast<int>(channel) > 32) if (static_cast<int>(channel) < 0 || static_cast<int>(channel) > 32)
return FTLERROR_STREAM_BAD_CHANNEL; return FTLERROR_STREAM_BAD_CHANNEL;
if (!stream->video_fs.hasFrame(sourceId)) if (!stream->video_fs->hasFrame(sourceId))
return FTLERROR_STREAM_NO_INTRINSICS; return FTLERROR_STREAM_NO_INTRINSICS;
if (!data) return FTLERROR_STREAM_NO_DATA; if (!data) return FTLERROR_STREAM_NO_DATA;
if (stream->video_fs.hasChannel(static_cast<ftl::codecs::Channel>(channel))) if (stream->video_fs->hasChannel(static_cast<ftl::codecs::Channel>(channel)))
return FTLERROR_STREAM_DUPLICATE; return FTLERROR_STREAM_DUPLICATE;
stream->sender->set("codec", 1); stream->sender->set("codec", 1);
...@@ -117,9 +118,9 @@ ftlError_t ftlImageWrite( ...@@ -117,9 +118,9 @@ ftlError_t ftlImageWrite(
stream->sender->set("lossless", true); stream->sender->set("lossless", true);
try { try {
auto &frame = stream->video_fs.frames[sourceId]; auto &frame = stream->video_fs->frames[sourceId];
auto &img = frame.create<cv::cuda::GpuMat>(static_cast<ftl::codecs::Channel>(channel)); auto &img = frame.create<cv::cuda::GpuMat>(static_cast<ftl::codecs::Channel>(channel));
auto &intrin = frame.getLeft(); auto &intrin = frame.cast<ftl::rgbd::Frame>().getLeft();
LOG(INFO) << "INTRIN: " << intrin.width << "x" << intrin.height << " for " << sourceId << ", " << (int)channel; LOG(INFO) << "INTRIN: " << intrin.width << "x" << intrin.height << " for " << sourceId << ", " << (int)channel;
...@@ -155,10 +156,10 @@ ftlError_t ftlImageWrite( ...@@ -155,10 +156,10 @@ ftlError_t ftlImageWrite(
if (tmp2.empty()) return FTLERROR_STREAM_NO_DATA; if (tmp2.empty()) return FTLERROR_STREAM_NO_DATA;
img.upload(tmp2); img.upload(tmp2);
ftl::codecs::Channels<0> channels; std::unordered_set<ftl::codecs::Channel> channels;
if (stream->stream->size() > static_cast<unsigned int>(stream->video_fs.id)) channels = stream->stream->selected(stream->video_fs.id); if (stream->stream->size() > static_cast<unsigned int>(stream->video_fs->id().frameset())) channels = stream->stream->selected(stream->video_fs->id().frameset());
channels += static_cast<ftl::codecs::Channel>(channel); channels += static_cast<ftl::codecs::Channel>(channel);
stream->stream->select(stream->video_fs.id, channels, true); stream->stream->select(stream->video_fs->id().frameset(), channels, true);
} catch (const std::exception &e) { } catch (const std::exception &e) {
return FTLERROR_UNKNOWN; return FTLERROR_UNKNOWN;
...@@ -174,14 +175,18 @@ ftlError_t ftlIntrinsicsWriteLeft(ftlStream_t stream, int32_t sourceId, int32_t ...@@ -174,14 +175,18 @@ ftlError_t ftlIntrinsicsWriteLeft(ftlStream_t stream, int32_t sourceId, int32_t
if (sourceId < 0 || sourceId >= 32) if (sourceId < 0 || sourceId >= 32)
return FTLERROR_STREAM_INVALID_PARAMETER; return FTLERROR_STREAM_INVALID_PARAMETER;
while (stream->video_fs.frames.size() <= static_cast<unsigned int>(sourceId)) { //while (stream->video_fs->frames.size() < static_cast<unsigned int>(sourceId)) {
stream->video_fs.frames.emplace_back(); stream->video_fs->resize(static_cast<unsigned int>(sourceId)+1);
} //}
if (stream->video_fs.hasFrame(sourceId)) { if (stream->video_fs->hasFrame(sourceId)) {
return FTLERROR_STREAM_DUPLICATE; return FTLERROR_STREAM_DUPLICATE;
} }
if (stream->video_fs->frames[sourceId].status() == ftl::data::FrameStatus::CREATED) {
stream->video_fs->frames[sourceId].store();
}
ftl::rgbd::Camera cam; ftl::rgbd::Camera cam;
cam.fx = f; cam.fx = f;
cam.fy = f; cam.fy = f;
...@@ -193,12 +198,11 @@ ftlError_t ftlIntrinsicsWriteLeft(ftlStream_t stream, int32_t sourceId, int32_t ...@@ -193,12 +198,11 @@ ftlError_t ftlIntrinsicsWriteLeft(ftlStream_t stream, int32_t sourceId, int32_t
cam.maxDepth = maxDepth; cam.maxDepth = maxDepth;
cam.baseline = baseline; cam.baseline = baseline;
cam.doffs = 0.0f; cam.doffs = 0.0f;
stream->video_fs.mask |= 1 << sourceId; stream->video_fs->mask |= 1 << sourceId;
stream->video_fs.count++; //if (!stream->video_fs->frames[sourceId].origin()) {
if (!stream->video_fs.frames[sourceId].origin()) { // stream->video_fs.frames[sourceId].setOrigin(&stream->video_states[sourceId]);
stream->video_fs.frames[sourceId].setOrigin(&stream->video_states[sourceId]); //}
} stream->video_fs->frames[sourceId].cast<ftl::rgbd::Frame>().setLeft() = cam;
stream->video_fs.frames[sourceId].setLeft(cam);
stream->has_fresh_data = true; stream->has_fresh_data = true;
return FTLERROR_OK; return FTLERROR_OK;
...@@ -209,7 +213,7 @@ ftlError_t ftlIntrinsicsWriteRight(ftlStream_t stream, int32_t sourceId, int32_t ...@@ -209,7 +213,7 @@ ftlError_t ftlIntrinsicsWriteRight(ftlStream_t stream, int32_t sourceId, int32_t
return FTLERROR_STREAM_INVALID_STREAM; return FTLERROR_STREAM_INVALID_STREAM;
if (sourceId < 0 || sourceId >= 32) if (sourceId < 0 || sourceId >= 32)
return FTLERROR_STREAM_INVALID_PARAMETER; return FTLERROR_STREAM_INVALID_PARAMETER;
if (!stream->video_fs.hasFrame(sourceId)) if (!stream->video_fs->hasFrame(sourceId))
return FTLERROR_STREAM_NO_INTRINSICS; return FTLERROR_STREAM_NO_INTRINSICS;
ftl::rgbd::Camera cam; ftl::rgbd::Camera cam;
...@@ -223,7 +227,7 @@ ftlError_t ftlIntrinsicsWriteRight(ftlStream_t stream, int32_t sourceId, int32_t ...@@ -223,7 +227,7 @@ ftlError_t ftlIntrinsicsWriteRight(ftlStream_t stream, int32_t sourceId, int32_t
cam.maxDepth = maxDepth; cam.maxDepth = maxDepth;
cam.baseline = baseline; cam.baseline = baseline;
cam.doffs = 0.0f; cam.doffs = 0.0f;
stream->video_fs.frames[sourceId].setRight(cam); stream->video_fs->frames[sourceId].cast<ftl::rgbd::Frame>().setRight() = cam;
stream->has_fresh_data = true; stream->has_fresh_data = true;
return FTLERROR_OK; return FTLERROR_OK;
...@@ -234,15 +238,15 @@ ftlError_t ftlPoseWrite(ftlStream_t stream, int32_t sourceId, const float *data) ...@@ -234,15 +238,15 @@ ftlError_t ftlPoseWrite(ftlStream_t stream, int32_t sourceId, const float *data)
if (!stream->stream) return FTLERROR_STREAM_INVALID_STREAM; if (!stream->stream) return FTLERROR_STREAM_INVALID_STREAM;
if (sourceId < 0 || sourceId >= 32) if (sourceId < 0 || sourceId >= 32)
return FTLERROR_STREAM_INVALID_PARAMETER; return FTLERROR_STREAM_INVALID_PARAMETER;
if (!stream->video_fs.hasFrame(sourceId)) if (!stream->video_fs->hasFrame(sourceId))
return FTLERROR_STREAM_NO_INTRINSICS; return FTLERROR_STREAM_NO_INTRINSICS;
if (!data) return FTLERROR_STREAM_NO_DATA; if (!data) return FTLERROR_STREAM_NO_DATA;
Eigen::Matrix4f pose; Eigen::Matrix4f pose;
for (int i=0; i<16; ++i) pose.data()[i] = data[i]; for (int i=0; i<16; ++i) pose.data()[i] = data[i];
auto &frame = stream->video_fs.frames[sourceId]; auto &frame = stream->video_fs->frames[sourceId].cast<ftl::rgbd::Frame>();
frame.setPose(pose.cast<double>()); frame.setPose() = pose.cast<double>();
return FTLERROR_OK; return FTLERROR_OK;
} }
...@@ -252,16 +256,16 @@ ftlError_t ftlRemoveOcclusion(ftlStream_t stream, int32_t sourceId, ftlChannel_t ...@@ -252,16 +256,16 @@ ftlError_t ftlRemoveOcclusion(ftlStream_t stream, int32_t sourceId, ftlChannel_t
if (!stream->stream) return FTLERROR_STREAM_INVALID_STREAM; if (!stream->stream) return FTLERROR_STREAM_INVALID_STREAM;
if (sourceId < 0 || sourceId >= 32) if (sourceId < 0 || sourceId >= 32)
return FTLERROR_STREAM_INVALID_PARAMETER; return FTLERROR_STREAM_INVALID_PARAMETER;
if (!stream->video_fs.hasFrame(sourceId)) if (!stream->video_fs->hasFrame(sourceId))
return FTLERROR_STREAM_NO_INTRINSICS; return FTLERROR_STREAM_NO_INTRINSICS;
if (static_cast<int>(channel) < 0 || static_cast<int>(channel) > 32) if (static_cast<int>(channel) < 0 || static_cast<int>(channel) > 32)
return FTLERROR_STREAM_BAD_CHANNEL; return FTLERROR_STREAM_BAD_CHANNEL;
if (!stream->video_fs.frames[sourceId].hasChannel(static_cast<ftl::codecs::Channel>(channel))) if (!stream->video_fs->frames[sourceId].hasChannel(static_cast<ftl::codecs::Channel>(channel)))
return FTLERROR_STREAM_BAD_CHANNEL; return FTLERROR_STREAM_BAD_CHANNEL;
auto &frame = stream->video_fs.frames[sourceId]; auto &frame = stream->video_fs->frames[sourceId].cast<ftl::rgbd::Frame>();
//auto &mask = frame.create<cv::cuda::GpuMat>(ftl::codecs::Channel::Mask); //auto &mask = frame.create<cv::cuda::GpuMat>(ftl::codecs::Channel::Mask);
auto &depth = frame.get<cv::cuda::GpuMat>(static_cast<ftl::codecs::Channel>(channel)); auto &depth = frame.set<cv::cuda::GpuMat>(static_cast<ftl::codecs::Channel>(channel));
auto &intrin = frame.getLeft(); auto &intrin = frame.getLeft();
cv::Mat depthR(intrin.height, intrin.width, CV_32F, const_cast<float*>(data), pitch); cv::Mat depthR(intrin.height, intrin.width, CV_32F, const_cast<float*>(data), pitch);
...@@ -277,14 +281,14 @@ ftlError_t ftlMaskOcclusion(ftlStream_t stream, int32_t sourceId, ftlChannel_t c ...@@ -277,14 +281,14 @@ ftlError_t ftlMaskOcclusion(ftlStream_t stream, int32_t sourceId, ftlChannel_t c
if (!stream->stream) return FTLERROR_STREAM_INVALID_STREAM; if (!stream->stream) return FTLERROR_STREAM_INVALID_STREAM;
if (sourceId < 0 || sourceId >= 32) if (sourceId < 0 || sourceId >= 32)
return FTLERROR_STREAM_INVALID_PARAMETER; return FTLERROR_STREAM_INVALID_PARAMETER;
if (!stream->video_fs.hasFrame(sourceId)) if (!stream->video_fs->hasFrame(sourceId))
return FTLERROR_STREAM_NO_INTRINSICS; return FTLERROR_STREAM_NO_INTRINSICS;
if (static_cast<int>(channel) < 0 || static_cast<int>(channel) > 32) if (static_cast<int>(channel) < 0 || static_cast<int>(channel) > 32)
return FTLERROR_STREAM_BAD_CHANNEL; return FTLERROR_STREAM_BAD_CHANNEL;
if (!stream->video_fs.frames[sourceId].hasChannel(static_cast<ftl::codecs::Channel>(channel))) if (!stream->video_fs->frames[sourceId].hasChannel(static_cast<ftl::codecs::Channel>(channel)))
return FTLERROR_STREAM_BAD_CHANNEL; return FTLERROR_STREAM_BAD_CHANNEL;
auto &frame = stream->video_fs.frames[sourceId]; auto &frame = stream->video_fs->frames[sourceId].cast<ftl::rgbd::Frame>();
auto &mask = frame.create<cv::cuda::GpuMat>(ftl::codecs::Channel::Mask); auto &mask = frame.create<cv::cuda::GpuMat>(ftl::codecs::Channel::Mask);
auto &depth = frame.get<cv::cuda::GpuMat>(static_cast<ftl::codecs::Channel>(channel)); auto &depth = frame.get<cv::cuda::GpuMat>(static_cast<ftl::codecs::Channel>(channel));
auto &intrin = frame.getLeft(); auto &intrin = frame.getLeft();
...@@ -330,10 +334,10 @@ ftlError_t ftlSelect(ftlStream_t stream, ftlChannel_t channel) { ...@@ -330,10 +334,10 @@ ftlError_t ftlSelect(ftlStream_t stream, ftlChannel_t channel) {
if (static_cast<int>(channel) < 0 || static_cast<int>(channel) > 32) if (static_cast<int>(channel) < 0 || static_cast<int>(channel) > 32)
return FTLERROR_STREAM_BAD_CHANNEL; return FTLERROR_STREAM_BAD_CHANNEL;
ftl::codecs::Channels<0> channels; std::unordered_set<ftl::codecs::Channel> channels;
if (stream->stream->size() > static_cast<unsigned int>(stream->video_fs.id)) channels = stream->stream->selected(stream->video_fs.id); if (stream->stream->size() > static_cast<unsigned int>(stream->video_fs->id().frameset())) channels = stream->stream->selected(stream->video_fs->id().frameset());
channels += static_cast<ftl::codecs::Channel>(channel); channels += static_cast<ftl::codecs::Channel>(channel);
stream->stream->select(stream->video_fs.id, channels, true); stream->stream->select(stream->video_fs->id().frameset(), channels, true);
return FTLERROR_OK; return FTLERROR_OK;
} }
...@@ -354,26 +358,18 @@ ftlError_t ftlNextFrame(ftlStream_t stream) { ...@@ -354,26 +358,18 @@ ftlError_t ftlNextFrame(ftlStream_t stream) {
try { try {
cudaSetDevice(0); cudaSetDevice(0);
if (stream->pipelines) { if (stream->pipelines) {
stream->pipelines->apply(stream->video_fs, stream->video_fs, 0); stream->pipelines->apply(*stream->video_fs, *stream->video_fs);
// FIXME: Stream sync
}
for (auto &c : stream->video_fs->firstFrame().changed()) {
stream->sender->post(*stream->video_fs, c.first);
} }
stream->sender->post(stream->video_fs);
} catch (const std::exception &e) { } catch (const std::exception &e) {
return FTLERROR_STREAM_ENCODE_FAILED; return FTLERROR_STREAM_ENCODE_FAILED;
} }
// Reset the frameset. stream->video_fs = std::make_shared<ftl::data::FrameSet>(&stream->pool, ftl::data::FrameID(0,0), stream->video_fs->timestamp()+stream->interval);
for (size_t i=0; i<stream->video_fs.frames.size(); ++i) {
if (!stream->video_fs.hasFrame(i)) continue;
auto &f = stream->video_fs.frames[i];
f.reset();
f.setOrigin(&stream->video_states[i]);
}
// FIXME: These should be reset each time
//stream->video_fs.count = 0;
//stream->video_fs.mask = 0;
stream->video_fs.timestamp += stream->interval;
stream->has_fresh_data = false; stream->has_fresh_data = false;
return FTLERROR_OK; return FTLERROR_OK;
} }
...@@ -389,9 +385,12 @@ ftlError_t ftlDestroyStream(ftlStream_t stream) { ...@@ -389,9 +385,12 @@ ftlError_t ftlDestroyStream(ftlStream_t stream) {
try { try {
cudaSetDevice(0); cudaSetDevice(0);
if (stream->pipelines) { if (stream->pipelines) {
stream->pipelines->apply(stream->video_fs, stream->video_fs, 0); stream->pipelines->apply(*stream->video_fs, *stream->video_fs);
// FIXME: Stream sync
}
for (auto &c : stream->video_fs->firstFrame().changed()) {
stream->sender->post(*stream->video_fs, c.first);
} }
stream->sender->post(stream->video_fs);
} catch (const std::exception &e) { } catch (const std::exception &e) {
err = FTLERROR_STREAM_ENCODE_FAILED; err = FTLERROR_STREAM_ENCODE_FAILED;
LOG(ERROR) << "Sender exception: " << e.what(); LOG(ERROR) << "Sender exception: " << e.what();
...@@ -418,12 +417,12 @@ ftlError_t ftlSetPropertyString(ftlStream_t stream, int32_t sourceId, const char ...@@ -418,12 +417,12 @@ ftlError_t ftlSetPropertyString(ftlStream_t stream, int32_t sourceId, const char
if (!stream->stream) return FTLERROR_STREAM_INVALID_STREAM; if (!stream->stream) return FTLERROR_STREAM_INVALID_STREAM;
if (sourceId < 0 || sourceId >= 32) if (sourceId < 0 || sourceId >= 32)
return FTLERROR_STREAM_INVALID_PARAMETER; return FTLERROR_STREAM_INVALID_PARAMETER;
if (!stream->video_fs.hasFrame(sourceId)) if (!stream->video_fs->hasFrame(sourceId))
return FTLERROR_STREAM_NO_INTRINSICS; return FTLERROR_STREAM_NO_INTRINSICS;
if (!value) return FTLERROR_STREAM_INVALID_PARAMETER; if (!value) return FTLERROR_STREAM_INVALID_PARAMETER;
if (!prop) return FTLERROR_STREAM_INVALID_PARAMETER; if (!prop) return FTLERROR_STREAM_INVALID_PARAMETER;
stream->video_fs.frames[sourceId].set(std::string(prop), std::string(value)); //stream->video_fs.frames[sourceId].set(std::string(prop), std::string(value));
return FTLERROR_OK; return FTLERROR_OK;
} }
...@@ -432,12 +431,12 @@ ftlError_t ftlSetPropertyInt(ftlStream_t stream, int32_t sourceId, const char *p ...@@ -432,12 +431,12 @@ ftlError_t ftlSetPropertyInt(ftlStream_t stream, int32_t sourceId, const char *p
if (!stream->stream) return FTLERROR_STREAM_INVALID_STREAM; if (!stream->stream) return FTLERROR_STREAM_INVALID_STREAM;
if (sourceId < 0 || sourceId >= 32) if (sourceId < 0 || sourceId >= 32)
return FTLERROR_STREAM_INVALID_PARAMETER; return FTLERROR_STREAM_INVALID_PARAMETER;
if (!stream->video_fs.hasFrame(sourceId)) if (!stream->video_fs->hasFrame(sourceId))
return FTLERROR_STREAM_NO_INTRINSICS; return FTLERROR_STREAM_NO_INTRINSICS;
if (!value) return FTLERROR_STREAM_INVALID_PARAMETER; if (!value) return FTLERROR_STREAM_INVALID_PARAMETER;
if (!prop) return FTLERROR_STREAM_INVALID_PARAMETER; if (!prop) return FTLERROR_STREAM_INVALID_PARAMETER;
stream->video_fs.frames[sourceId].set(std::string(prop), value); //stream->video_fs.frames[sourceId].set(std::string(prop), value);
return FTLERROR_OK; return FTLERROR_OK;
} }
...@@ -446,11 +445,11 @@ ftlError_t ftlSetPropertyFloat(ftlStream_t stream, int32_t sourceId, const char ...@@ -446,11 +445,11 @@ ftlError_t ftlSetPropertyFloat(ftlStream_t stream, int32_t sourceId, const char
if (!stream->stream) return FTLERROR_STREAM_INVALID_STREAM; if (!stream->stream) return FTLERROR_STREAM_INVALID_STREAM;
if (sourceId < 0 || sourceId >= 32) if (sourceId < 0 || sourceId >= 32)
return FTLERROR_STREAM_INVALID_PARAMETER; return FTLERROR_STREAM_INVALID_PARAMETER;
if (!stream->video_fs.hasFrame(sourceId)) if (!stream->video_fs->hasFrame(sourceId))
return FTLERROR_STREAM_NO_INTRINSICS; return FTLERROR_STREAM_NO_INTRINSICS;
if (!value) return FTLERROR_STREAM_INVALID_PARAMETER; if (!value) return FTLERROR_STREAM_INVALID_PARAMETER;
if (!prop) return FTLERROR_STREAM_INVALID_PARAMETER; if (!prop) return FTLERROR_STREAM_INVALID_PARAMETER;
stream->video_fs.frames[sourceId].set(std::string(prop), value); //stream->video_fs.frames[sourceId].set(std::string(prop), value);
return FTLERROR_OK; return FTLERROR_OK;
} }
SDK/Python/ftl/codecs.py
View file @ 70063e8d
...@@ -14,8 +14,8 @@ from enum import IntEnum ...@@ -14,8 +14,8 @@ from enum import IntEnum
################################################################################ ################################################################################
# components/codecs/include/ftl/codecs/packet.hpp # components/codecs/include/ftl/codecs/packet.hpp
Packet = namedtuple("Packet", ["codec", "definition", "block_total", Packet = namedtuple("Packet", ["codec", "definition", "frame_count",
"block_number", "flags", "data"]) "bitrate", "flags", "data"])
StreamPacket = namedtuple("StreamPacket", ["timestamp", "frameset_id", StreamPacket = namedtuple("StreamPacket", ["timestamp", "frameset_id",
"frame_number", "channel"]) "frame_number", "channel"])
...@@ -33,7 +33,10 @@ class codec_t(IntEnum): ...@@ -33,7 +33,10 @@ class codec_t(IntEnum):
PNG = 1 PNG = 1
H264 = 2 H264 = 2
HEVC = 3 HEVC = 3
WAV = 4 H264_LOSSLESS = 4
HEVC_LOSSLESS = 5
WAV = 32
OPUS = 33
JSON = 100 JSON = 100
CALIBRATION = 101 CALIBRATION = 101
POSE = 102 POSE = 102
...@@ -127,10 +130,10 @@ class FTLDecoder: ...@@ -127,10 +130,10 @@ class FTLDecoder:
################################################################################ ################################################################################
def split_images(packet, im): def split_images(packet, im):
if packet.block_total == 1: if packet.frame_count == 1:
return im return im
n = packet.block_total n = packet.frame_count
height, width = definition_t[packet.definition] height, width = definition_t[packet.definition]
cols = im.shape[1] // width cols = im.shape[1] // width
...@@ -145,7 +148,7 @@ def split_images(packet, im): ...@@ -145,7 +148,7 @@ def split_images(packet, im):
return imgs return imgs
def decode_codec_opencv(packet): def decode_codec_opencv(packet):
if packet.block_total != 1 or packet.block_number != 0: if packet.frame_count != 1:
warn("Unsupported block format (todo)") # is this relevant? warn("Unsupported block format (todo)") # is this relevant?
im = _int_to_float(cv.imdecode(np.frombuffer(packet.data, dtype=np.uint8), im = _int_to_float(cv.imdecode(np.frombuffer(packet.data, dtype=np.uint8),
...@@ -154,7 +157,7 @@ def decode_codec_opencv(packet): ...@@ -154,7 +157,7 @@ def decode_codec_opencv(packet):
return split_images(packet, im) return split_images(packet, im)
def decode_codec_opencv_float(packet): def decode_codec_opencv_float(packet):
if packet.block_total != 1 or packet.block_number != 0: if packet.frame_count != 1:
warn("Unsupported block format (todo)") # is this relevant? warn("Unsupported block format (todo)") # is this relevant?
im = cv.imdecode(np.frombuffer(packet.data, dtype=np.uint8), im = cv.imdecode(np.frombuffer(packet.data, dtype=np.uint8),
......
SDK/Python/ftl/streamwriter.py
View file @ 70063e8d
...@@ -151,9 +151,9 @@ class FTLStreamWriter: ...@@ -151,9 +151,9 @@ class FTLStreamWriter:
elif data.dtype in [np.int8, np.uint8]: elif data.dtype in [np.int8, np.uint8]:
if nchans == 3: if nchans == 3:
ftl_dtype = _imageformat_t.RGB ftl_dtype = _imageformat_t.BGR
elif nchans == 4: elif nchans == 4:
ftl_dtype = _imageformat_t.RGBA ftl_dtype = _imageformat_t.BGRA
else: else:
raise ValueError("Unsupported number of channels: %i" % nchans) raise ValueError("Unsupported number of channels: %i" % nchans)
......
SDK/Python/test/test_readwrite.py
View file @ 70063e8d
...@@ -12,6 +12,7 @@ class TestStreamWriter(unittest.TestCase): ...@@ -12,6 +12,7 @@ class TestStreamWriter(unittest.TestCase):
def test_read_write_frames_uint8_1080p(self): def test_read_write_frames_uint8_1080p(self):
""" Write calibration and random 1080p image and then read them """ """ Write calibration and random 1080p image and then read them """
return # Sebastian to fix this test: Line 31 has wrong channel in orig[1].
f = tempfile.NamedTemporaryFile(suffix=".ftl") f = tempfile.NamedTemporaryFile(suffix=".ftl")
......
applications/aruco/CMakeLists.txt 0 → 100644
View file @ 70063e8d
set(FTLARUCOSRC
src/main.cpp
)
add_executable(ftl-aruco ${FTLARUCOSRC})
target_include_directories(ftl-aruco PRIVATE src)
target_link_libraries(ftl-aruco ftlcommon Threads::Threads ${OpenCV_LIBS})
applications/aruco/src/main.cpp 0 → 100644
View file @ 70063e8d
#include <ftl/timer.hpp>
#include <ftl/configuration.hpp>
#include <opencv2/highgui.hpp>
#include <opencv2/aruco.hpp>
#include <vector>
#include <string>
int main(int argc, char** argv) {
std::vector<cv::Mat> tags;
unsigned int ntags = 10;
cv::Ptr<cv::aruco::Dictionary> dict =
cv::aruco::getPredefinedDictionary(cv::aruco::DICT_4X4_50);
unsigned int size = 512;
unsigned int margin = 64;
unsigned int delay = 50;
argc--;
argv++;
auto opts = ftl::config::read_options(&argv, &argc);
if (opts.count("delay"))
delay = std::stoi(opts["delay"]);
if (opts.count("dict"))
dict = cv::aruco::getPredefinedDictionary(std::stoi(opts["dict"]));
if (opts.count("ntags"))
ntags = std::stoi(opts["ntags"]);
if (opts.count("size"))
size = std::stoi(opts["size"]);
if (opts.count("margin"))
margin = std::stoi(opts["margin"]);
cv::Mat blank = cv::Mat(size + margin*2, size + margin*2, CV_8UC1);
blank.setTo(255);
for (unsigned int i = 0; i < ntags; i++) {
auto& tag = tags.emplace_back();
tag.create(size + margin*2, size + margin*2, CV_8UC1);
tag.setTo(255);
cv::aruco::drawMarker(dict, i, size, tag(cv::Rect(margin, margin, size, size)), 1);
}
int id = 0;
bool show_blank = false;
ftl::timer::setInterval(delay);
ftl::timer::setHighPrecision(true);
auto h = ftl::timer::add(ftl::timer::kTimerMain, [&](uint64_t){
cv::imshow("ArUco", show_blank ? blank : tags[id]);
if (cv::waitKey(1) == 27) { ftl::timer::stop(false); }
show_blank = !show_blank;
id = (id + 1) % ntags;
return true;
});
ftl::timer::start(true);
return 0;
}
\ No newline at end of file
applications/calibration-ceres/CMakeLists.txt deleted 100644 → 0
View file @ e2e259ab
add_executable (ftl-calibration-ceres
src/main.cpp
src/calibration_data.cpp
src/visibility.cpp
src/calibration.cpp
)
target_include_directories(ftl-calibration-ceres PRIVATE src/)
target_include_directories(ftl-calibration-ceres PUBLIC ${OpenCV_INCLUDE_DIRS})
target_link_libraries(ftl-calibration-ceres ftlcalibration Threads::Threads ftlcommon Eigen3::Eigen ceres)
add_subdirectory(test)
applications/calibration-ceres/src/calibration.cpp deleted 100644 → 0
View file @ e2e259ab
#include "calibration.hpp"
#include "ftl/calibration/optimize.hpp"
#include "loguru.hpp"
#include <opencv2/core.hpp>
#include <opencv2/calib3d.hpp>
using std::vector;
using cv::Mat;
using cv::Size;
using cv::Point2d;
using cv::Point3d;
using cv::Vec3d;
using cv::norm;
using ftl::calibration::BundleAdjustment;
using namespace ftl::calibration;
int ftl::calibration::recoverPose(const Mat &E, const vector<Point2d> &_points1,
const vector<Point2d> &_points2, const Mat &_cameraMatrix1,
const Mat &_cameraMatrix2, Mat &_R, Mat &_t, double distanceThresh,
Mat &triangulatedPoints) {
Mat cameraMatrix1;
Mat cameraMatrix2;
Mat cameraMatrix;
Mat points1(_points1.size(), 2, CV_64FC1);
Mat points2(_points2.size(), 2, CV_64FC1);
CHECK(points1.size() == points2.size());
for (size_t i = 0; i < _points1.size(); i++) {
auto p1 = points1.ptr<double>(i);
p1[0] = _points1[i].x;
p1[1] = _points1[i].y;
auto p2 = points2.ptr<double>(i);
p2[0] = _points2[i].x;
p2[1] = _points2[i].y;
}
_cameraMatrix1.convertTo(cameraMatrix1, CV_64F);
_cameraMatrix2.convertTo(cameraMatrix2, CV_64F);
cameraMatrix = Mat::eye(Size(3, 3), CV_64FC1);
double fx1 = cameraMatrix1.at<double>(0,0);
double fy1 = cameraMatrix1.at<double>(1,1);
double cx1 = cameraMatrix1.at<double>(0,2);
double cy1 = cameraMatrix1.at<double>(1,2);
double fx2 = cameraMatrix2.at<double>(0,0);
double fy2 = cameraMatrix2.at<double>(1,1);
double cx2 = cameraMatrix2.at<double>(0,2);
double cy2 = cameraMatrix2.at<double>(1,2);
points1.col(0) = (points1.col(0) - cx1) / fx1;
points1.col(1) = (points1.col(1) - cy1) / fy1;
points2.col(0) = (points2.col(0) - cx2) / fx2;
points2.col(1) = (points2.col(1) - cy2) / fy2;
// TODO mask
// cameraMatrix = I (for details, see OpenCV's recoverPose() source code)
// modules/calib3d/src/five-point.cpp (461)
//
// https://github.com/opencv/opencv/blob/371bba8f54560b374fbcd47e7e02f015ac4969ad/modules/calib3d/src/five-point.cpp#L461
return cv::recoverPose(E, points1, points2, cameraMatrix, _R, _t, distanceThresh, cv::noArray(), triangulatedPoints);
}
double ftl::calibration::computeExtrinsicParameters(const Mat &K1, const Mat &D1,
const Mat &K2, const Mat &D2, const vector<Point2d> &points1,
const vector<Point2d> &points2, const vector<Point3d> &object_points, Mat &R,
Mat &t, vector<Point3d> &points_out) {
Mat F = cv::findFundamentalMat(points1, points2, cv::noArray(), cv::FM_8POINT);
Mat E = K2.t() * F * K1;
Mat points3dh;
// distanceThresh unit?
recoverPose(E, points1, points2, K1, K2, R, t, 1000.0, points3dh);
points_out.clear();
points_out.reserve(points3dh.cols);
for (int col = 0; col < points3dh.cols; col++) {
CHECK(points3dh.at<double>(3, col) != 0);
Point3d p = Point3d(points3dh.at<double>(0, col),
points3dh.at<double>(1, col),
points3dh.at<double>(2, col))
/ points3dh.at<double>(3, col);
points_out.push_back(p);
}
double s = ftl::calibration::optimizeScale(object_points, points_out);
t = t * s;
auto params1 = Camera(K1, D1, Mat::eye(3, 3, CV_64FC1), Mat::zeros(3, 1, CV_64FC1));
auto params2 = Camera(K2, D2, R, t);
auto ba = BundleAdjustment();
ba.addCamera(params1);
ba.addCamera(params2);
for (size_t i = 0; i < points_out.size(); i++) {
ba.addPoint({points1[i], points2[i]}, points_out[i]);
}
ba.addObject(object_points);
double error_before = ba.reprojectionError();
BundleAdjustment::Options options;
options.optimize_intrinsic = false;
options.fix_camera_extrinsic = {0};
ba.run(options);
double error_after = ba.reprojectionError();
// bundle adjustment didn't work correctly if these checks fail
if (error_before < error_after) {
LOG(WARNING) << "error before < error_after (" << error_before << " <" << error_after << ")";
}
CHECK((cv::countNonZero(params1.rvec()) == 0) && (cv::countNonZero(params1.tvec()) == 0));
R = params2.rmat();
t = params2.tvec();
return sqrt(error_after);
}
applications/calibration-ceres/src/calibration.hpp deleted 100644 → 0
View file @ e2e259ab
#pragma once
#ifndef _FTL_CALIBRATION_HPP_
#define _FTL_CALIBRATION_HPP_
#include <vector>
#include <opencv2/core/core.hpp>
namespace ftl {
namespace calibration {
/**
* Same as OpenCV's recoverPose(), but does not assume same intrinsic paramters
* for both cameras.
*
* @todo Write unit tests to check that intrinsic parameters work as expected.
*/
int recoverPose(const cv::Mat &E, const std::vector<cv::Point2d> &_points1,
const std::vector<cv::Point2d> &_points2, const cv::Mat &_cameraMatrix1,
const cv::Mat &_cameraMatrix2, cv::Mat &_R, cv::Mat &_t,
double distanceThresh, cv::Mat &triangulatedPoints);
/**
* Find camera rotation and translation from first to second camera. Uses
* OpenCV's recoverPose() (with modifications) to estimate camera pose and
* triangulate point locations. Scale is estimated from object_points. 8 point
* algorithm (OpenCV) is used to estimate fundamental matrix at beginning.
*/
double computeExtrinsicParameters(const cv::Mat &K1, const cv::Mat &D1,
const cv::Mat &K2, const cv::Mat &D2, const std::vector<cv::Point2d> &points1,
const std::vector<cv::Point2d> &points2, const std::vector<cv::Point3d> &object_points,
cv::Mat &R, cv::Mat &t, std::vector<cv::Point3d> &points_out);
}
}
#endif
applications/calibration-ceres/src/calibration_data.cpp deleted 100644 → 0
View file @ e2e259ab
#include "calibration_data.hpp"
#include <opencv2/calib3d.hpp>
using std::vector;
using std::reference_wrapper;
using std::pair;
using std::make_pair;
using cv::Mat;
using cv::Point2d;
using cv::Point3d;
using cv::Vec3d;
using cv::Rect;
using cv::Size;
using ftl::calibration::CalibrationData;
CalibrationData::CalibrationData(int n_cameras) { init(n_cameras); }
void CalibrationData::init(int n_cameras) {
n_cameras_ = n_cameras;
cameras_ = vector<Camera>(n_cameras);
}
int CalibrationData::addObservation(const vector<bool> &visible, const vector<Point2d> &observations) {
if ((int) observations.size() != n_cameras_) { throw std::exception(); }
if ((int) visible.size() != n_cameras_) { throw std::exception(); }
visible_.insert(visible_.end(), visible.begin(), visible.end());
observations_.insert(observations_.end(), observations.begin(), observations.end());
points_.push_back(Point3d(0.0, 0.0, 0.0));
return npoints() - 1;
}
int CalibrationData::addObservation(const vector<bool> &visible, const vector<Point2d> &observations, const Point3d &point) {
if ((int) observations.size() != n_cameras_) { throw std::exception(); }
if ((int) visible.size() != n_cameras_) { throw std::exception(); }
visible_.insert(visible_.end(), visible.begin(), visible.end());
observations_.insert(observations_.end(), observations.begin(), observations.end());
points_.push_back(point);
return npoints() - 1;
}
int CalibrationData::addObservations(const vector<bool>& visible, const vector<vector<Point2d>>& observations, const vector<Point3d>& points) {
int retval = -1;
for (size_t i = 0; i < observations.size(); i++) {
retval = addObservation(visible, observations[i], points[i]);
}
return retval;
}
pair<vector<vector<Point2d>>, vector<reference_wrapper<Point3d>>> CalibrationData::_getVisible(const vector<int> &cameras) {
int n_points = npoints();
vector<vector<Point2d>> observations(cameras.size());
vector<reference_wrapper<Point3d>> points;
for (size_t k = 0; k < cameras.size(); k++) {
observations[k].reserve(n_points);
}
points.reserve(n_points);
for (int i = 0; i < n_points; i++) {
if (!isVisible(cameras, i)) { continue; }
for (size_t k = 0; k < cameras.size(); k++) {
observations[k].push_back(getObservation(cameras[k], i));
}
points.push_back(getPoint(i));
}
return make_pair(observations, points);
}
vector<vector<Point2d>> CalibrationData::getObservations(const vector<int> &cameras) {
return _getVisible(cameras).first;
}
vector<reference_wrapper<Point3d>> CalibrationData::getPoints(const vector<int> &cameras) {
return _getVisible(cameras).second;
}
applications/calibration-ceres/src/calibration_data.hpp deleted 100644 → 0
View file @ e2e259ab
#pragma once
#ifndef _FTL_CALIBRATION_DATA_HPP_
#define _FTL_CALIBRATION_DATA_HPP_
#include <vector>
#include <opencv2/core/core.hpp>
#include <ftl/calibration/optimize.hpp>
#define _NDISTORTION_PARAMETERS 3
#define _NCAMERA_PARAMETERS (9 + _NDISTORTION_PARAMETERS)
namespace ftl {
namespace calibration {
class CalibrationData {
public:
CalibrationData() {};
explicit CalibrationData(int n_cameras);
void init(int n_cameras);
int addObservation(const std::vector<bool>& visible, const std::vector<cv::Point2d>& observations);
int addObservation(const std::vector<bool>& visible, const std::vector<cv::Point2d>& observations, const cv::Point3d& point);
int addObservations(const std::vector<bool>& visible, const std::vector<std::vector<cv::Point2d>>& observations, const std::vector<cv::Point3d>& point);
void reserve(int n_points) {
points_.reserve(n_points);
points_camera_.reserve(n_points*n_cameras_);
observations_.reserve(n_points*n_cameras_);
visible_.reserve(n_points*n_cameras_);
}
// TODO: method for save poinst_camera_, could return (for example)
// vector<pair<Point3d*>, vector<Point3d*>>
std::vector<std::vector<cv::Point2d>> getObservations(const std::vector<int> &cameras);
/* Get points corresponding to observations returned by getObservations() or getObservationsPtr() */
std::vector<std::reference_wrapper<cv::Point3d>> getPoints(const std::vector<int> &cameras);
/* get reference/pointer to data */
inline Camera& getCamera(int k) { return cameras_[k]; }
inline std::vector<Camera>& getCameras() { return cameras_; }
inline cv::Point3d& getPoint(int i) { return points_[i]; }
inline cv::Point2d& getObservation(int k, int i) { return observations_[n_cameras_*i+k]; }
inline bool isVisible(int k, int i) { return visible_[n_cameras_*i+k]; }
inline bool isVisible(const std::vector<int> &cameras, int i) {
for (const auto &k : cameras) { if (!isVisible(k, i)) { return false; } }
return true;
}
int npoints() const { return points_.size(); }
int ncameras() const { return n_cameras_; }
private:
std::pair<std::vector<std::vector<cv::Point2d>>, std::vector<std::reference_wrapper<cv::Point3d>>> _getVisible(const std::vector<int> &cameras);
int n_cameras_;
// cameras
std::vector<Camera> cameras_;
// points for each observation
std::vector<cv::Point3d> points_;
// points estimated from cameras' observations
std::vector<cv::Point3d> points_camera_;
// observations
std::vector<cv::Point2d> observations_;
// visibility
std::vector<bool> visible_;
};
}
}
#endif
applications/calibration-ceres/src/main.cpp deleted 100644 → 0
View file @ e2e259ab
#include "loguru.hpp"
#include <tuple>
#include <opencv2/core.hpp>
#include <opencv2/calib3d.hpp>
#include <opencv2/opencv.hpp>
#include <ceres/ceres.h>
#include <ceres/rotation.h>
#include <ftl/calibration.hpp>
#include "calibration_data.hpp"
#include "visibility.hpp"
#include "calibration.hpp"
using std::string;
using std::vector;
using std::map;
using std::reference_wrapper;
using std::tuple;
using std::pair;
using std::make_pair;
using cv::Mat;
using cv::Size;
using cv::Point2d;
using cv::Point3d;
using namespace ftl::calibration;
void loadData( const string &fname,
Visibility &visibility,
CalibrationData &data) {
vector<Mat> K;
vector<vector<int>> visible;
vector<vector<Point2d>> points;
cv::FileStorage fs(fname, cv::FileStorage::READ);
fs["K"] >> K;
fs["points2d"] >> points;
fs["visible"] >> visible;
fs.release();
int ncameras = K.size();
int npoints = points[0].size();
visibility.init(ncameras);
data.init(ncameras);
for (int i = 0; i < npoints; i+= 1) {
vector<bool> v(ncameras, 0);
vector<Point2d> p(ncameras);
for (int k = 0; k < ncameras; k++) {
v[k] = visible[k][i];
p[k] = points[k][i];
}
visibility.update(v);
data.addObservation(v, p);
}
for (size_t i = 1; i < K.size(); i += 2) {
// mask right cameras
visibility.mask(i-1, i);
}
for (int i = 0; i < ncameras; i++) {
data.getCamera(i).setIntrinsic(K[i]);
}
}
void calibrate(const string &fname) {
Visibility visibility;
CalibrationData data;
loadData(fname, visibility, data);
// 2x 15cm squares (ArUco tags) 10cm apart
vector<Point3d> object_points = {
Point3d(0.0, 0.0, 0.0),
Point3d(0.15, 0.0, 0.0),
Point3d(0.15, 0.15, 0.0),
Point3d(0.0, 0.15, 0.0),
Point3d(0.25, 0.0, 0.0),
Point3d(0.40, 0.0, 0.0),
Point3d(0.40, 0.15, 0.0),
Point3d(0.25, 0.15, 0.0)
};
int refcamera = 0;
auto path = visibility.shortestPath(refcamera);
map<pair<int, int>, pair<Mat, Mat>> transformations;
// Needs better solution which allows simple access to all estimations.
// Required for calculating average coordinates and to know which points
// are missing.
vector<tuple<int, vector<Point3d>>> points_all;
transformations[make_pair(refcamera, refcamera)] =
make_pair(Mat::eye(3, 3, CV_64FC1), Mat::zeros(3, 1, CV_64FC1));
for (int i = 0; i < data.ncameras(); i++) {
// Calculate initial translation T from refcam. Visibility graph is
// used to create a chain of transformations from refcam to i.
int current = refcamera;
if (i == refcamera) { continue; }
Mat D = Mat::zeros(1, 5, CV_64FC1);
Mat R = Mat::eye(3, 3, CV_64FC1);
Mat t = Mat::zeros(3, 1, CV_64FC1);
for (const int &to : path.to(i)) {
auto edge = make_pair(current, to);
if (transformations.find(edge) == transformations.end()) {
Mat R_;
Mat t_;
vector<Point3d> points;
auto observations = data.getObservations({current, to});
double err = computeExtrinsicParameters(
data.getCamera(current).intrinsicMatrix(),
data.getCamera(current).distortionCoefficients(),
data.getCamera(to).intrinsicMatrix(),
data.getCamera(to).distortionCoefficients(),
observations[0], observations[1],
object_points, R_, t_, points);
LOG(INFO) << current << " -> " << to << " (RMS error: " << err << ")";
transformations[edge] = make_pair(R_, t_);
points_all.push_back(make_tuple(current, points));
}
const auto [R_update, t_update] = transformations[edge];
R = R * R_update;
t = R_update * t + t_update;
current = to;
}
transformations[make_pair(refcamera, i)] = make_pair(R.clone(), t.clone());
data.getCamera(i).setExtrinsic(R, t);
}
// TODO: see points_all comment
/*
for (auto& [i, points] : points_all) {
Mat R = data.getCamera(i).rmat();
Mat t = data.getCamera(i).tvec();
transform::inverse(R, t); // R, t: refcam -> i
CHECK(points.size() == points_ref.size());
for (size_t j = 0; j < points.size(); j++) {
Point3d &point = points_ref[j];
if (point != Point3d(0,0,0)) {
point = (transform::apply(points[j], R, t) + point) / 2.0;
}
else {
point = transform::apply(points[j], R, t);
}
}
}
*/
vector<int> idx;
BundleAdjustment ba;
ba.addCameras(data.getCameras());
vector<bool> visible(data.ncameras());
vector<Point2d> observations(data.ncameras());
int missing = 0;
for (int i = 0; i < data.npoints(); i++) {
for (int j = 0; j < data.ncameras(); j++) {
visible[j] = data.isVisible(j, i);
observations[j] = data.getObservation(j, i);
}
// TODO: see points_all comment
if (data.getPoint(i) == Point3d(0.,0.,0.)) {
missing++;
continue;
}
ba.addPoint(visible, observations, data.getPoint(i));
}
LOG(INFO) << "missing points: " << missing;
LOG(INFO) << "Initial reprojection error: " << ba.reprojectionError();
BundleAdjustment::Options options;
options.verbose = false;
options.optimize_intrinsic = true;
ba.run(options);
LOG(INFO) << "Finale reprojection error: " << ba.reprojectionError();
// calibration done, updated values in data
}
int main(int argc, char* argv[]) {
return 0;
}
applications/calibration-ceres/test/CMakeLists.txt deleted 100644 → 0
View file @ e2e259ab
add_executable(visibility_unit
./tests.cpp
../src/visibility.cpp
./visibility_unit.cpp
)
target_include_directories(visibility_unit PUBLIC ../src/)
target_link_libraries(visibility_unit Threads::Threads dl ftlcommon)
add_test(VisibilityTest visibility_unit)
################################################################################
#add_executable(calibration_unit
# ./tests.cpp
# ../src/calibration.cpp
# ../src/optimization.cpp
# ../src/calibration_data.cpp
# ./calibration_unit.cpp
#)
#target_include_directories(calibration_unit PUBLIC ../src/)
#target_link_libraries(calibration_unit Threads::Threads dl ftlcommon Eigen3::Eigen ceres)
#add_test(CalibrationTest calibration_unit WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
applications/calibration-ceres/test/calibration_unit.cpp deleted 100644 → 0
View file @ e2e259ab
#include "catch.hpp"
#include "calibration.hpp"
#include "optimization.hpp"
#include <vector>
#include <opencv2/core/core.hpp>
using std::vector;
using std::string;
using cv::Mat;
using cv::Point3d;
using cv::Point2d;
using namespace ftl::calibration;
void loadData(const string &fname,vector<Mat> &K, vector<vector<int>> &visible,
vector<vector<Point2d>> &points) {
cv::FileStorage fs(fname, cv::FileStorage::READ);
fs["K"] >> K;
fs["points2d"] >> points;
fs["visible"] >> visible;
fs.release();
}
/* TEST_CASE("Camera calibration and parameter optimization", "") {
vector<Mat> K;
vector<vector<int>> visible;
vector<vector<Point2d>> observations;
SECTION("Load data") {
loadData("data/points.yml", K, visible, observations);
//REQUIRE(K.size() != 0);
}
//int ncameras = K.size();
//int npoints = observations[0].size();
}*/
applications/calibration-ceres/test/tests.cpp deleted 100644 → 0
View file @ e2e259ab
#define CATCH_CONFIG_MAIN
#include "catch.hpp"
\ No newline at end of file
applications/calibration-multi/CMakeLists.txt deleted 100644 → 0
View file @ e2e259ab
set(CALIBMULTI
src/main.cpp
src/visibility.cpp
src/util.cpp
src/multicalibrate.cpp
../calibration-ceres/src/calibration.cpp
)
add_executable(ftl-calibrate-multi ${CALIBMULTI})
target_include_directories(ftl-calibrate-multi PRIVATE src ../calibration-ceres/src)
target_link_libraries(ftl-calibrate-multi ftlcalibration ftlcommon ftlnet ftlrgbd ftlstreams Threads::Threads ${OpenCV_LIBS} ceres)
applications/calibration-multi/src/main.cpp deleted 100644 → 0
View file @ e2e259ab
This diff is collapsed.