diff --git a/components/operators/src/disparity/bilateral_filter.cpp b/components/operators/src/disparity/bilateral_filter.cpp index 09e92024a23fe611c20f9c66220388f1825bc707..8c91fac6f317250f7a8af9b85a0c975e217bdfe7 100644 --- a/components/operators/src/disparity/bilateral_filter.cpp +++ b/components/operators/src/disparity/bilateral_filter.cpp @@ -1,5 +1,3 @@ -#pragma once - #include <ftl/operators/disparity.hpp> using cv::cuda::GpuMat; @@ -32,6 +30,6 @@ bool DisparityBilateralFilter::apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out disp_in.convertTo(disp_int_, CV_16SC1, scale_, cvstream); filter_->apply(disp_int_, rgb, disp_int_result_, cvstream); - disp_int_result_.convertTo(disp_out, 1.0/scale_, cvstream); + disp_int_result_.convertTo(disp_out, disp_in.type(), 1.0/scale_, cvstream); return true; } \ No newline at end of file diff --git a/components/rgbd-sources/src/sources/stereovideo/stereovideo.cpp b/components/rgbd-sources/src/sources/stereovideo/stereovideo.cpp index aaff4ec7b6b610ca3d16f13c13e682c4110c7712..830e202537f30770758e304a1267b5471006571f 100644 --- a/components/rgbd-sources/src/sources/stereovideo/stereovideo.cpp +++ b/components/rgbd-sources/src/sources/stereovideo/stereovideo.cpp @@ -119,12 +119,12 @@ void StereoVideoSource::init(const string &file) { mask_l_gpu.download(mask_l); mask_l_ = (mask_l == 0); - pipeline_input_ = ftl::config::create<ftl::operators::Graph>(host_, "pipeline_input"); + pipeline_input_ = ftl::config::create<ftl::operators::Graph>(host_, "input"); #ifdef HAVE_OPTFLOW pipeline_input_->append<ftl::operators::NVOpticalFlow>("optflow"); #endif - pipeline_depth_ = ftl::config::create<ftl::operators::Graph>(host_, "pipeline_disparity"); + pipeline_depth_ = ftl::config::create<ftl::operators::Graph>(host_, "disparity"); pipeline_depth_->append<ftl::operators::FixstarsSGM>("algorithm"); pipeline_depth_->append<ftl::operators::DisparityBilateralFilter>("bilateral_filter"); pipeline_depth_->append<ftl::operators::DisparitySmoothingOF>("optflow_filter");