Disable calibration and exclude camera parameters files from packaging

Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

diff --git a/packaging/dfs-opencv.spec b/packaging/dfs-opencv.spec
index 41a145716b6fa3095bb425e7b3305dcee6f1c060..99699ff50beebf9adf0b7a9d05105db341fe313c 100644 (file)
--- a/packaging/dfs-opencv.spec
+++ b/packaging/dfs-opencv.spec
@@ -35,8 +35,8 @@ make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_datadir}/%{name}
-cp res/*.yaml %{buildroot}%{_datadir}/%{name}/
+#mkdir -p %{buildroot}%{_datadir}/%{name}
+#cp res/*.yaml %{buildroot}%{_datadir}/%{name}/
 
 %make_install
 
@@ -48,4 +48,4 @@ cp res/*.yaml %{buildroot}%{_datadir}/%{name}/
 %license LICENSE.APLv2
 %defattr(-,root,root,-)
 %{_libdir}/*.so
-%{_datadir}/%{name}/*.yaml
+#%{_datadir}/%{name}/*.yaml

diff --git a/src/dfs_opencv.cpp b/src/dfs_opencv.cpp
index 93496cad77aaadf11a6796a83d0fcab90a8f9e8f..ff7477009a1a5ac559b3f141945f183bfc61d375 100644 (file)
--- a/src/dfs_opencv.cpp
+++ b/src/dfs_opencv.cpp
@@ -24,6 +24,8 @@
 #define DEFAULT_STEREO_HD_CALIB_FILE_NAME "stereoCalibZedHD.yaml"
 
 #define MAX_THREADS_NUM 2
+#define ENABLE_CALIBRATION 0
+
 namespace DfsAdaptationImpl
 {
        DfsOCV::DfsOCV() :
@@ -185,21 +187,18 @@ namespace DfsAdaptationImpl
 
                this->SetParameters();
 
+#if ENABLE_CALIBRATION
                try {
                        this->InitializeStereoCalibration();
                        this->InitRectifyMap();
                } catch (const std::exception& e) {
                        throw e;
                }
-
-#if 0 // oneway
-               mDfsPostOcv = cv::ximgproc::createDisparityWLSFilterGeneric(false);
-               mDfsPostOcv->setDepthDiscontinuityRadius(static_cast<int>(ceil(0.5*mBlockSize)));
-#else // twoway
+#endif
                mDfsPostOcv = cv::ximgproc::createDisparityWLSFilter(mDfsOcv);
                mDfsOcvExtra = cv::ximgproc::createRightMatcher(mDfsOcv);
                mDfsPostOcv->setLRCthresh(24.0);
-#endif
+
                mDfsPostOcv->setSigmaColor(10.0);
                mDfsPostOcv->setLambda(8000);
 
@@ -368,8 +367,13 @@ namespace DfsAdaptationImpl
                cv::Mat rBaseMat, rExtraMat, dispMat, dispFiltMat;
 
                // with remap
+#if ENABLE_CALIBRATION
                cv::remap(baseMat, rBaseMat, mBaseReMap[0], mBaseReMap[1], cv::INTER_LINEAR);
                cv::remap(extraMat, rExtraMat, mExtraReMap[0], mExtraReMap[1], cv::INTER_LINEAR);
+#else
+               rBaseMat = baseMat;
+               rExtraMat = extraMat;
+#endif
 
                cv::Mat srcBaseMat, srcExtraMat;
                cv::resize(rBaseMat, srcBaseMat,