diff --git a/components/operators/CMakeLists.txt b/components/operators/CMakeLists.txt
index 54da0eb4be9284b27ac9d5f9c338a7fa98eb6987..e4f7fa533fb9b36d3fcda6851cad6628e6292ee4 100644
--- a/components/operators/CMakeLists.txt
+++ b/components/operators/CMakeLists.txt
@@ -9,6 +9,8 @@ add_library(ftloperators
src/filling.cpp
src/filling.cu
src/nvopticalflow.cpp
+ src/disparity/optflow_smoothing.cpp
+ src/disparity/optflow_smoothing.cu
)
# These cause errors in CI build and are being removed from PCL in newer versions
diff --git a/components/operators/include/ftl/operators/disparity.hpp b/components/operators/include/ftl/operators/disparity.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..8e7758107124fe54cd7a3d46f9ddd6b30be00cad
--- /dev/null
+++ b/components/operators/include/ftl/operators/disparity.hpp
@@ -0,0 +1,28 @@
+#pragma once
+
+
+#include <ftl/operators/operator.hpp>
+#include <opencv2/cudaoptflow.hpp>
+
+namespace ftl {
+namespace operators {
+
+/*
+ * Optical flow smoothing for disparity (or depth)
+ */
+class DisparitySmoothingOF : public ftl::operators::Operator {
+ public:
+ explicit DisparitySmoothingOF(ftl::Configurable*);
+ ~DisparitySmoothingOF();
+
+ inline Operator::Type type() const override { return Operator::Type::OneToOne; }
+
+ bool apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out, ftl::rgbd::Source *src, cudaStream_t stream) override;
+
+ private:
+ cv::cuda::GpuMat history_;
+};
+
+
+}
+}
diff --git a/components/rgbd-sources/src/offilter.cpp b/components/operators/src/disparity/optflow_smoothing.cpp
similarity index 56%
rename from components/rgbd-sources/src/offilter.cpp
rename to components/operators/src/disparity/optflow_smoothing.cpp
index 8bb3ef601d18156e1b2a1d7600b621ceefa8c2e0..fcfa1aa50c461e2e3101839b7d251aaf5a7c7fa9 100644
--- a/components/rgbd-sources/src/offilter.cpp
+++ b/components/operators/src/disparity/optflow_smoothing.cpp
@@ -1,12 +1,16 @@
+#include <loguru.hpp>
+
+#include "ftl/operators/disparity.hpp"
#include "ftl/offilter.hpp"
-#include "cuda_algorithms.hpp"
+#include "disparity/optflow_smoothing.hpp"
#ifdef HAVE_OPTFLOW
-#include <loguru.hpp>
+using ftl::operators::DisparitySmoothingOF;
-using namespace ftl::rgbd;
-using namespace ftl::codecs;
+using ftl::codecs::Channel;
+using ftl::rgbd::Frame;
+using ftl::rgbd::Source;
using cv::Mat;
using cv::Size;
@@ -15,18 +19,19 @@ using std::vector;
template<typename T> static bool inline isValidDisparity(T d) { return (0.0 < d) && (d < 256.0); } // TODO
-OFDisparityFilter::OFDisparityFilter(Size size, int n_frames, float threshold) :
- n_max_(n_frames + 1), threshold_(threshold)
-{
+DisparitySmoothingOF::DisparitySmoothingOF(ftl::Configurable* cfg) :
+ ftl::operators::Operator(cfg) {
+ // TODO read params
+ /*
CHECK((n_max_ > 1) && (n_max_ <= 32)) << "History length must be between 0 and 31!";
disp_old_ = cv::cuda::GpuMat(cv::Size(size.width * n_max_, size.height), CV_32FC1);
-
- /*nvof_ = cv::cuda::NvidiaOpticalFlow_1_0::create(size.width, size.height,
- cv::cuda::NvidiaOpticalFlow_1_0::NV_OF_PERF_LEVEL_SLOW,
- true, false, false, 0);*/
-
+ */
}
+DisparitySmoothingOF::~DisparitySmoothingOF() {}
+
+bool DisparitySmoothingOF::apply(Frame &in, Frame &out, Source *src, cudaStream_t stream) {
+/*
void OFDisparityFilter::filter(ftl::rgbd::Frame &frame, cv::cuda::Stream &stream)
{
frame.upload(Channel::Flow, stream);
@@ -38,15 +43,8 @@ void OFDisparityFilter::filter(ftl::rgbd::Frame &frame, cv::cuda::Stream &stream
cv::cuda::GpuMat &disp = frame.create<cv::cuda::GpuMat>(Channel::Disparity);
ftl::cuda::optflow_filter(disp, optflow, disp_old_, n_max_, threshold_, stream);
}
-
-void OFDisparityFilter::filter(cv::cuda::GpuMat &disp, cv::cuda::GpuMat &optflow, cv::cuda::Stream &stream)
-{
- if (disp.type() != CV_32FC1) {
- LOG(ERROR) << "Optical flow filter expects CV_32FC1 (TODO)";
- return;
- }
-
- ftl::cuda::optflow_filter(disp, optflow, disp_old_, n_max_, threshold_, stream);
+*/
+ return true;
}
#endif // HAVE_OPTFLOW
diff --git a/components/rgbd-sources/src/algorithms/offilter.cu b/components/operators/src/disparity/optflow_smoothing.cu
similarity index 97%
rename from components/rgbd-sources/src/algorithms/offilter.cu
rename to components/operators/src/disparity/optflow_smoothing.cu
index 6feee5ae1daf9fc8b4b165370dbb8646b1d7b8a1..b703a62aac386a535b83f23a1aface414a238465 100644
--- a/components/rgbd-sources/src/algorithms/offilter.cu
+++ b/components/operators/src/disparity/optflow_smoothing.cu
@@ -1,7 +1,9 @@
#include <ftl/cuda_common.hpp>
#include <ftl/rgbd/camera.hpp>
#include <opencv2/core/cuda_stream_accessor.hpp>
-#include <qsort.h>
+
+#include "disparity/qsort.h"
+#include "optflow_smoothing.hpp"
__device__ void quicksort(float A[], size_t n)
{
diff --git a/components/operators/src/disparity/optflow_smoothing.hpp b/components/operators/src/disparity/optflow_smoothing.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..8deb30f4ce593a03c0ee1093c25e504f900d5d7f
--- /dev/null
+++ b/components/operators/src/disparity/optflow_smoothing.hpp
@@ -0,0 +1,12 @@
+#include <ftl/cuda_common.hpp>
+
+namespace ftl {
+namespace cuda {
+
+void optflow_filter(cv::cuda::GpuMat &disp, const cv::cuda::GpuMat &optflow,
+ cv::cuda::GpuMat &history, int n_max, float threshold,
+ cv::cuda::Stream &stream);
+
+
+}
+}
diff --git a/components/rgbd-sources/include/qsort.h b/components/operators/src/disparity/qsort.h
similarity index 100%
rename from components/rgbd-sources/include/qsort.h
rename to components/operators/src/disparity/qsort.h
diff --git a/components/rgbd-sources/CMakeLists.txt b/components/rgbd-sources/CMakeLists.txt
index 7b81e216d9adb11c5898493077bd02dd2121dfbb..70b5f7afb0c8f63a9518a80063afa6bf9f3a9123 100644
--- a/components/rgbd-sources/CMakeLists.txt
+++ b/components/rgbd-sources/CMakeLists.txt
@@ -17,7 +17,6 @@ set(RGBDSRC
# src/algorithms/opencv_bm.cpp
src/cb_segmentation.cpp
src/abr.cpp
- src/offilter.cpp
src/sources/virtual/virtual.cpp
src/sources/ftlfile/file_source.cpp
src/sources/ftlfile/player.cpp
@@ -41,7 +40,6 @@ endif (LIBSGM_FOUND)
if (CUDA_FOUND)
list(APPEND RGBDSRC
src/algorithms/disp2depth.cu
- src/algorithms/offilter.cu
# "src/algorithms/opencv_cuda_bm.cpp"
# "src/algorithms/opencv_cuda_bp.cpp"
# "src/algorithms/rtcensus.cu"
diff --git a/components/rgbd-sources/src/algorithms/fixstars_sgm.cpp b/components/rgbd-sources/src/algorithms/fixstars_sgm.cpp
index f96ebcd81ed7336ab34ba0e24322587a63fd6c3b..bbcad8c63f923bd92cbda56cb009e88d2ec50eb0 100644
--- a/components/rgbd-sources/src/algorithms/fixstars_sgm.cpp
+++ b/components/rgbd-sources/src/algorithms/fixstars_sgm.cpp
@@ -42,6 +42,7 @@ FixstarsSGM::FixstarsSGM(nlohmann::json &config) : Disparity(config) {
});
#ifdef HAVE_OPTFLOW
+/*
updateOFDisparityFilter();
on("use_off", [this](const ftl::config::Event&) {
@@ -51,6 +52,7 @@ FixstarsSGM::FixstarsSGM(nlohmann::json &config) : Disparity(config) {
on("use_off", [this](const ftl::config::Event&) {
updateOFDisparityFilter();
});
+*/
#endif
init(size_);
@@ -136,6 +138,7 @@ bool FixstarsSGM::updateBilateralFilter() {
}
#ifdef HAVE_OPTFLOW
+/*
bool FixstarsSGM::updateOFDisparityFilter() {
bool enable = value("use_off", false);
int off_size = value("off_size", 9);
@@ -163,7 +166,7 @@ bool FixstarsSGM::updateOFDisparityFilter() {
}
return use_off_;
-}
+}*/
#endif
void FixstarsSGM::compute(ftl::rgbd::Frame &frame, cv::cuda::Stream &stream)
@@ -216,12 +219,14 @@ void FixstarsSGM::compute(ftl::rgbd::Frame &frame, cv::cuda::Stream &stream)
dispt_scaled.convertTo(disp, CV_32F, 1.0f / 16.0f, stream);
#ifdef HAVE_OPTFLOW
+/*
// TODO: Optical flow filter expects CV_32F
if (use_off_) {
frame.upload(Channel::Flow, stream);
stream.waitForCompletion();
off_.filter(disp, frame.get<GpuMat>(Channel::Flow), stream);
}
+*/
#endif
}
diff --git a/components/rgbd-sources/src/algorithms/fixstars_sgm.hpp b/components/rgbd-sources/src/algorithms/fixstars_sgm.hpp
index 90d330079e177f6adbb41ebbd6c7830bbf87e031..2de1c41ef377570915397ea2758d265fa875b179 100644
--- a/components/rgbd-sources/src/algorithms/fixstars_sgm.hpp
+++ b/components/rgbd-sources/src/algorithms/fixstars_sgm.hpp
@@ -59,7 +59,7 @@ namespace ftl {
cv::cuda::GpuMat dispt_;
#ifdef HAVE_OPTFLOW
- ftl::rgbd::OFDisparityFilter off_;
+ //ftl::rgbd::OFDisparityFilter off_;
#endif
};
};
diff --git a/components/rgbd-sources/src/cuda_algorithms.hpp b/components/rgbd-sources/src/cuda_algorithms.hpp
index 439c16cfc21fef08086bb69b7e84b1c8b49fec74..f07c698f14d172aff96a7b59726b64cd9b98000d 100644
--- a/components/rgbd-sources/src/cuda_algorithms.hpp
+++ b/components/rgbd-sources/src/cuda_algorithms.hpp
@@ -41,10 +41,6 @@ namespace cuda {
void disparity_to_depth(const cv::cuda::GpuMat &disparity, cv::cuda::GpuMat &depth,
const ftl::rgbd::Camera &c, cv::cuda::Stream &stream);
- void optflow_filter(cv::cuda::GpuMat &disp, const cv::cuda::GpuMat &optflow,
- cv::cuda::GpuMat &history, int n_max, float threshold,
- cv::cuda::Stream &stream);
-
}
}
diff --git a/components/rgbd-sources/src/sources/stereovideo/stereovideo.cpp b/components/rgbd-sources/src/sources/stereovideo/stereovideo.cpp
index 3bc0b2fa5c4642b3bce9580e52cd4c918d73711a..a018859c87e1a1141b102135b38077e18e2c739f 100644
--- a/components/rgbd-sources/src/sources/stereovideo/stereovideo.cpp
+++ b/components/rgbd-sources/src/sources/stereovideo/stereovideo.cpp
@@ -194,6 +194,9 @@ void StereoVideoSource::swap() {
bool StereoVideoSource::compute(int n, int b) {
auto &frame = frames_[1];
+
+ pipeline_depth_->apply(frame, frame, host_, cv::cuda::StreamAccessor::getStream(stream_));
+
auto &left = frame.get<cv::cuda::GpuMat>(Channel::Left);
auto &right = frame.get<cv::cuda::GpuMat>(Channel::Right);