Merge pull request #680 from alicevision/dev_depthMapOptim

Depth map refactoring

meshroom/nodes/aliceVision/DepthMap.py

@@ -63,6 +63,38 @@ Use a downscale factor of one (full-resolution) only if the quality of the input
             uid=[0],
             advanced=True,
         ),
+        desc.IntParam(
+            name='sgmScale',
+            label='SGM: Downscale factor',
+            description='Semi Global Matching: Downscale factor used to compute the similarity volume.',
+            value=-1,
+            range=(-1, 10, 1),
+            uid=[0],
+        ),
+        desc.IntParam(
+            name='sgmStepXY',
+            label='SGM: Step XY',
+            description='Semi Global Matching: Step used to compute the similarity volume on X and Y axis.',
+            value=-1,
+            range=(-1, 10, 1),
+            uid=[0],
+        ),
+        desc.IntParam(
+            name='sgmStepZ',
+            label='SGM: Step Z',
+            description='Semi Global Matching: Step used to compute the similarity volume on Z axis.',
+            value=-1,
+            range=(-1, 10, 1),
+            uid=[0],
+        ),
+        desc.IntParam(
+            name='sgmMaxSideXY',
+            label='SGM: Max Side',
+            description='Semi Global Matching: Max side in pixels used to automatically decide for sgmScale/sgmStep if not defined.',
+            value=700,
+            range=(-1, 1000, 1),
+            uid=[0],
+        ),
         desc.IntParam(
             name='sgmMaxTCams',
             label='SGM: Nb Neighbour Cameras',
@@ -98,6 +130,59 @@ Use a downscale factor of one (full-resolution) only if the quality of the input
             uid=[0],
             advanced=True,
         ),
+
+        desc.FloatParam(
+            name='sgmP1',
+            label='SGM: P1',
+            description='Semi Global Matching: P1.',
+            value=10.0,
+            range=(0.0, 255.0, 0.5),
+            uid=[0],
+            advanced=True,
+        ),
+        desc.FloatParam(
+            name='sgmP2',
+            label='SGM: P2',
+            description='Semi Global Matching: P2 weight.',
+            value=100.0,
+            range=(-255.0, 255.0, 0.5),
+            uid=[0],
+            advanced=True,
+        ),
+        desc.IntParam(
+            name='sgmMaxDepths',
+            label='SGM: Max Depths',
+            description='Semi Global Matching: Max number of depths in the overall similarity volume.',
+            value=3000,
+            range=(1, 5000, 1),
+            uid=[0],
+            advanced=True,
+        ),
+        desc.IntParam(
+            name='sgmMaxDepthsPerTc',
+            label='SGM: Max Depths Per Camera Pairs',
+            description='Semi Global Matching: Max number of depths to sweep in the similarity volume per Rc/Tc cameras.',
+            value=1500,
+            range=(1, 5000, 1),
+            uid=[0],
+            advanced=True,
+        ),
+        desc.BoolParam(
+            name='sgmUseSfmSeeds',
+            label='SGM: Use SfM Landmarks',
+            description='Semi Global Matching: Use landmarks from SfM to define the ranges for the plane sweeping.',
+            value=True,
+            uid=[0],
+            advanced=True,
+        ),
+        desc.StringParam(
+            name='sgmFilteringAxes',
+            label='SGM: Filtering Axes',
+            description="Semi Global Matching: Define axes for the filtering of the similarity volume.",
+            value='YX',
+            uid=[0],
+            advanced=True,
+        ),
         desc.IntParam( 
             name='refineMaxTCams', 
             label='Refine: Nb Neighbour Cameras', 

meshroom/nodes/aliceVision/DepthMapFilter.py

@@ -74,6 +74,15 @@ This allows to filter unstable points before starting the fusion of all depth ma
             range=(0, 10, 1),
             uid=[0],
         ),
+        desc.FloatParam(
+            name='pixToleranceFactor',
+            label='Tolerance Size',
+            description='Filtering tolerance size factor (in px).',
+            value=2.0,
+            range=(0.001, 10.0, 0.1),
+            uid=[0],
+            advanced=True,
+        ),
         desc.IntParam(
             name="pixSizeBall",
             label="Filtering Size in Pixels",