Merge pull request #2016 from alicevision/dev/disableStructure

Add an option to disable structure refinement

Author: servantftransperfect

meshroom/aliceVision/SfmExpanding.py

@@ -1,4 +1,4 @@
-__version__ = "2.2"
+__version__ = "2.3"
 
 from meshroom.core import desc
 from meshroom.core.utils import VERBOSE_LEVEL
@@ -174,6 +174,12 @@ class SfMExpanding(desc.AVCommandLineNode):
                         "This may be helpful if the input cameras are already fully calibrated.",
             value=False,
         ),
+        desc.BoolParam(
+            name="enableStructureRefinement",
+            label="Enable Structure Refinement",
+            description="Bundle adjustment will try to optimize the landmarks positions.",
+            value=True,
+        ),
         desc.IntParam(
             name="minNbCamerasToRefinePrincipalPoint",
             label="Min Nb Cameras To Refine Principal Point",

src/aliceVision/sfm/pipeline/expanding/SfmBundle.cpp

@@ -22,7 +22,12 @@ bool SfmBundle::process(sfmData::SfMData & sfmData, const track::TracksHandler &
 
     refineOptions |= BundleAdjustment::REFINE_ROTATION; 
     refineOptions |= BundleAdjustment::REFINE_TRANSLATION;
-    refineOptions |= BundleAdjustment::REFINE_STRUCTURE;
+
+    if (_isStructureRefinementEnabled)
+    {
+        refineOptions |= BundleAdjustment::REFINE_STRUCTURE;
+    }
+
     refineOptions |= BundleAdjustment::REFINE_INTRINSICS_ALL;
 
     options.setSparseBA();

src/aliceVision/sfm/pipeline/expanding/SfmBundle.hpp

@@ -72,6 +72,15 @@ class SfmBundle
         _minNbCamerasToRefinePrincipalPoint = count;
     }
 
+    /**
+     * @brief Set whether to enable structure refinement in bundle adjustment
+     * @param flag true to enable structure refinement, false to disable it
+    */
+    void setIsStructureRefinementEnabled(bool flag)
+    {
+        _isStructureRefinementEnabled = flag;
+    }
+
 private:
     /**
      * Initialize bundle properties
@@ -105,6 +114,7 @@ class SfmBundle
     size_t _minNbCamerasLBA = 100;
     size_t _LBAGraphDistanceLimit = 1;
     size_t _LBAMinNbOfMatches = 50;
+    bool _isStructureRefinementEnabled = true;
 };
 
 } // namespace sfm

src/software/pipeline/main_sfmExpanding.cpp

@@ -28,7 +28,7 @@
 // These constants define the current software version.
 // They must be updated when the command line is changed.
 #define ALICEVISION_SOFTWARE_VERSION_MAJOR 2
-#define ALICEVISION_SOFTWARE_VERSION_MINOR 2
+#define ALICEVISION_SOFTWARE_VERSION_MINOR 3
 
 using namespace aliceVision;
 
@@ -100,6 +100,7 @@ int aliceVision_main(int argc, char** argv)
     double maxReprojectionError = 4.0;
     double maxTriangulationError = 8.0;
     bool lockAllIntrinsics = false;
+    bool enableStructureRefinement = true;
     int minNbCamerasToRefinePrincipalPoint = 3;
     bool useRigConstraint = true;
     int minNbCamerasForRigCalibration = 20;
@@ -146,9 +147,10 @@ int aliceVision_main(int argc, char** argv)
     ("maxTriangulationError", po::value<double>(&maxTriangulationError)->default_value(maxTriangulationError), "Maximum reprojection error in the triangulation process.")
     ("maxReprojectionError", po::value<double>(&maxReprojectionError)->default_value(maxReprojectionError), "Maximum reprojection error in the bundle verification step.")
     ("lockAllIntrinsics", po::value<bool>(&lockAllIntrinsics)->default_value(lockAllIntrinsics), "Force lock of all camera intrinsic parameters, so they will not be refined during Bundle Adjustment.")
+    ("enableStructureRefinement", po::value<bool>(&enableStructureRefinement)->default_value(enableStructureRefinement), "Bundle adjustment will try to optimize the landmarks positions.")
     ("minNbCamerasToRefinePrincipalPoint", po::value<int>(&minNbCamerasToRefinePrincipalPoint)->default_value(minNbCamerasToRefinePrincipalPoint),
          "Minimal number of cameras to refine the principal point of the cameras (one of the intrinsic parameters of the camera). "
-         "If we do not have enough cameras, the principal point in consider is considered in the center of the image. "
+         "If we do not have enough cameras, the principal point is considered in the center of the image. "
          "If minNbCamerasToRefinePrincipalPoint<=0, the principal point is never refined. "
          "If minNbCamerasToRefinePrincipalPoint==1, the principal point is always refined.")
     ("useRigConstraint", po::value<bool>(&useRigConstraint)->default_value(useRigConstraint), "Enable/Disable rig constraint.")
@@ -233,6 +235,7 @@ int aliceVision_main(int argc, char** argv)
     sfmBundle->setMinAngleLandmark(minAngleForLandmark);
     sfmBundle->setMaxReprojectionError(maxReprojectionError);
     sfmBundle->setMinNbCamerasToRefinePrincipalPoint(minNbCamerasToRefinePrincipalPoint);
+    sfmBundle->setIsStructureRefinementEnabled(enableStructureRefinement);
 
     sfm::PointFetcher::uptr pointFetcherHandler;
     if (!meshFilename.empty())