[pipelines] use segmentation masks in keyframe selection

alicevision · Aug 28, 2023 · 758d3c9 · 758d3c9
1 parent 18abea9
commit 758d3c9
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 28 deletions.
diff --git a/meshroom/pipelines/cameraTracking.mg b/meshroom/pipelines/cameraTracking.mg
@@ -5,31 +5,31 @@
         "fileVersion": "1.1",
         "template": true,
         "nodesVersions": {
+            "ExportDistortion": "1.0",
+            "FeatureExtraction": "1.3",
+            "DepthMap": "4.0",
+            "Texturing": "6.0",
+            "ImageSegmentation": "1.0",
             "ApplyCalibration": "1.0",
-            "SfMTriangulation": "1.0",
-            "StructureFromMotion": "3.1",
-            "DepthMapFilter": "3.0",
-            "MeshFiltering": "3.0",
+            "ScenePreview": "1.0",
+            "MeshDecimate": "1.0",
             "KeyframeSelection": "5.0",
-            "Texturing": "6.0",
             "PrepareDenseScene": "3.1",
+            "SfMTransfer": "2.1",
+            "Publish": "1.3",
+            "MeshFiltering": "3.0",
+            "DepthMapFilter": "3.0",
+            "Meshing": "7.0",
             "ImageMatchingMultiSfM": "1.0",
             "FeatureMatching": "2.0",
             "CameraInit": "9.0",
-            "MeshDecimate": "1.0",
-            "ScenePreview": "1.0",
             "ImageMatching": "2.0",
             "CheckerboardDetection": "1.0",
             "ConvertSfMFormat": "2.0",
-            "SfMTransfer": "2.1",
+            "SfMTriangulation": "1.0",
+            "StructureFromMotion": "3.1",
             "ExportAnimatedCamera": "2.0",
-            "Publish": "1.3",
-            "DistortionCalibration": "3.0",
-            "ExportDistortion": "1.0",
-            "FeatureExtraction": "1.3",
-            "ImageSegmentation": "1.0",
-            "DepthMap": "4.0",
-            "Meshing": "7.0"
+            "DistortionCalibration": "3.0"
         }
     },
     "graph": {
@@ -151,6 +151,9 @@
             "inputs": {
                 "inputPaths": [
                     "{ApplyCalibration_1.output}"
+                ],
+                "maskPaths": [
+                    "{ImageSegmentation_1.output}"
                 ]
             },
             "internalInputs": {

diff --git a/meshroom/pipelines/photogrammetryAndCameraTracking.mg b/meshroom/pipelines/photogrammetryAndCameraTracking.mg
@@ -5,29 +5,29 @@
         "fileVersion": "1.1",
         "template": true,
         "nodesVersions": {
+            "ExportDistortion": "1.0",
+            "FeatureExtraction": "1.3",
+            "DepthMap": "4.0",
+            "Texturing": "6.0",
+            "ImageSegmentation": "1.0",
             "ApplyCalibration": "1.0",
-            "StructureFromMotion": "3.1",
-            "DepthMapFilter": "3.0",
-            "MeshFiltering": "3.0",
+            "ScenePreview": "1.0",
+            "MeshDecimate": "1.0",
             "KeyframeSelection": "5.0",
-            "Texturing": "6.0",
             "PrepareDenseScene": "3.1",
+            "Publish": "1.3",
+            "MeshFiltering": "3.0",
+            "DepthMapFilter": "3.0",
+            "Meshing": "7.0",
             "ImageMatchingMultiSfM": "1.0",
             "FeatureMatching": "2.0",
             "CameraInit": "9.0",
-            "MeshDecimate": "1.0",
-            "ScenePreview": "1.0",
             "ImageMatching": "2.0",
             "CheckerboardDetection": "1.0",
             "ConvertSfMFormat": "2.0",
+            "StructureFromMotion": "3.1",
             "ExportAnimatedCamera": "2.0",
-            "Publish": "1.3",
-            "DistortionCalibration": "3.0",
-            "ExportDistortion": "1.0",
-            "FeatureExtraction": "1.3",
-            "ImageSegmentation": "1.0",
-            "DepthMap": "4.0",
-            "Meshing": "7.0"
+            "DistortionCalibration": "3.0"
         }
     },
     "graph": {
@@ -122,6 +122,9 @@
             "inputs": {
                 "inputPaths": [
                     "{ApplyCalibration_1.output}"
+                ],
+                "maskPaths": [
+                    "{ImageSegmentation_1.output}"
                 ]
             },
             "internalInputs": {