From a16b475945b5e8c17af772f96883f28180ed7137 Mon Sep 17 00:00:00 2001 From: Tae-Young Chung Date: Fri, 21 Jan 2022 16:53:22 +0900 Subject: [PATCH] Add stereoConfigPath to get stereoConfig information for point cloud generation Signed-off-by: Tae-Young Chung --- include/dfs_adaptation.h | 3 ++- include/dfs_adaptation_impl.h | 2 +- include/dfs_parameter.h | 5 +++++ packaging/dfs-adaptation.spec | 2 +- src/dfs_adaptation_impl.cpp | 4 ++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/dfs_adaptation.h b/include/dfs_adaptation.h index 64c67a3..c637c94 100644 --- a/include/dfs_adaptation.h +++ b/include/dfs_adaptation.h @@ -38,7 +38,8 @@ namespace DfsAdaptation size_t width, size_t height, size_t minDisp, - size_t maxDisp) = 0; + size_t maxDisp, + std::string stereoConfigPath) = 0; /** * @brief Run dfs adaptor. diff --git a/include/dfs_adaptation_impl.h b/include/dfs_adaptation_impl.h index 89dbd3e..020634b 100644 --- a/include/dfs_adaptation_impl.h +++ b/include/dfs_adaptation_impl.h @@ -36,7 +36,7 @@ namespace DfsAdaptation void Unbind(); void Initialize(DfsParameter& param, size_t width, size_t height, - size_t minDisp, size_t maxDisp); + size_t minDisp, size_t maxDisp, std::string stereoConfigPath); void Run(DfsData& base, DfsData& extra); DfsData& GetDepthData(); }; diff --git a/include/dfs_parameter.h b/include/dfs_parameter.h index 61cb198..14991a4 100644 --- a/include/dfs_parameter.h +++ b/include/dfs_parameter.h @@ -18,6 +18,7 @@ #define __DFS_PARAMETER_H__ #include +#include /** * @file dfs_parameter.h * @brief This file contains the depth parameter structure. @@ -47,6 +48,10 @@ namespace DfsAdaptation size_t height; size_t stride; + std::vector> pointCloud; + double *pointCloudData; + size_t pointCloudSize; + DfsData() { data = nullptr; diff --git a/packaging/dfs-adaptation.spec b/packaging/dfs-adaptation.spec index bc66eec..d46dd0b 100644 --- a/packaging/dfs-adaptation.spec +++ b/packaging/dfs-adaptation.spec @@ -1,6 +1,6 @@ Name: dfs-adaptation Summary: Adaptation of depth-from-stereo -Version: 1.0.1 +Version: 1.0.2 Release: 0 Group: Multimedia/Framework License: Apache-2.0 diff --git a/src/dfs_adaptation_impl.cpp b/src/dfs_adaptation_impl.cpp index c16b637..6dc82d1 100644 --- a/src/dfs_adaptation_impl.cpp +++ b/src/dfs_adaptation_impl.cpp @@ -117,13 +117,13 @@ namespace DfsAdaptation } void DfsAdaptor::Initialize(DfsParameter& param, size_t width, size_t height, - size_t minDisp, size_t maxDisp) + size_t minDisp, size_t maxDisp, std::string stereoConfigPath) { LOGI("ENTER"); CHECK_INSTANCE(mDfsAdaptorHandle); - mDfsAdaptorHandle->Initialize(param, width, height, minDisp, maxDisp); + mDfsAdaptorHandle->Initialize(param, width, height, minDisp, maxDisp, stereoConfigPath); LOGI("LEAVE"); } -- 2.7.4