Merge pull request #2164 from alicevision/mug/addSegToPipeline

[pipelines] add ImageSegmentation node to tracking pipelines
alicevision · Aug 22, 2023 · 7df64ec · 7df64ec
2 parents 2cfcddb + e5a9573
commit 7df64ec
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 37 deletions.
diff --git a/meshroom/pipelines/cameraTracking.mg b/meshroom/pipelines/cameraTracking.mg
@@ -5,30 +5,31 @@
         "fileVersion": "1.1",
         "template": true,
         "nodesVersions": {
-            "DepthMap": "4.0",
-            "PrepareDenseScene": "3.0",
-            "Publish": "1.3",
-            "KeyframeSelection": "4.1",
-            "SfMTransfer": "2.1",
-            "ApplyCalibration": "1.0",
-            "ImageMatchingMultiSfM": "1.0",
-            "DepthMapFilter": "3.0",
+            "MeshDecimate": "1.0",
             "Texturing": "6.0",
-            "ImageMatching": "2.0",
-            "MeshFiltering": "3.0",
-            "FeatureMatching": "2.0",
-            "ScenePreview": "1.0",
-            "SfMTriangulation": "1.0",
-            "CheckerboardDetection": "1.0",
-            "ConvertSfMFormat": "2.0",
+            "ExportDistortion": "1.0",
             "CameraInit": "9.0",
+            "ImageMatchingMultiSfM": "1.0",
             "StructureFromMotion": "3.1",
-            "MeshDecimate": "1.0",
-            "ExportAnimatedCamera": "2.0",
+            "FeatureExtraction": "1.3",
+            "ApplyCalibration": "1.0",
+            "SfMTriangulation": "1.0",
+            "Publish": "1.3",
+            "DepthMap": "4.0",
             "DistortionCalibration": "3.0",
+            "DepthMapFilter": "3.0",
+            "ImageSegmentation": "1.0",
+            "CheckerboardDetection": "1.0",
+            "ScenePreview": "1.0",
             "Meshing": "7.0",
-            "ExportDistortion": "1.0",
-            "FeatureExtraction": "1.3"
+            "PrepareDenseScene": "3.0",
+            "ImageMatching": "2.0",
+            "KeyframeSelection": "4.1",
+            "ConvertSfMFormat": "2.0",
+            "ExportAnimatedCamera": "2.0",
+            "FeatureMatching": "2.0",
+            "SfMTransfer": "2.1",
+            "MeshFiltering": "3.0"
         }
     },
     "graph": {
@@ -78,7 +79,10 @@
                 200
             ],
             "inputs": {
-                "input": "{ApplyCalibration_1.output}"
+                "input": "{ApplyCalibration_1.output}",
+                "masksFolder": "{ImageSegmentation_1.output}",
+                "maskExtension": "exr",
+                "maskInvert": true
             },
             "internalInputs": {
                 "color": "#575963"
@@ -485,6 +489,19 @@
                 "label": "FeatureMatchingFramesToKeyframes",
                 "color": "#80766f"
             }
+        },
+        "ImageSegmentation_1": {
+            "nodeType": "ImageSegmentation",
+            "position": [
+                0,
+                200
+            ],
+            "inputs": {
+                "input": "{CameraInit_1.output}"
+            },
+            "internalInputs": {
+                "color": "#575963"
+            }
         }
     }
 }
diff --git a/meshroom/pipelines/photogrammetryAndCameraTracking.mg b/meshroom/pipelines/photogrammetryAndCameraTracking.mg
@@ -5,28 +5,29 @@
         "fileVersion": "1.1",
         "template": true,
         "nodesVersions": {
-            "FeatureMatching": "2.0",
-            "ConvertSfMFormat": "2.0",
-            "PrepareDenseScene": "3.0",
-            "Meshing": "7.0",
-            "KeyframeSelection": "4.1",
-            "FeatureExtraction": "1.3",
-            "MeshFiltering": "3.0",
-            "DepthMap": "4.0",
-            "ImageMatching": "2.0",
-            "DistortionCalibration": "3.0",
+            "MeshDecimate": "1.0",
             "Texturing": "6.0",
-            "DepthMapFilter": "3.0",
+            "ExportDistortion": "1.0",
             "CameraInit": "9.0",
-            "ScenePreview": "1.0",
+            "ImageMatchingMultiSfM": "1.0",
             "StructureFromMotion": "3.1",
-            "ExportDistortion": "1.0",
+            "FeatureExtraction": "1.3",
             "ApplyCalibration": "1.0",
             "Publish": "1.3",
+            "DepthMap": "4.0",
+            "DistortionCalibration": "3.0",
+            "DepthMapFilter": "3.0",
+            "ImageSegmentation": "1.0",
+            "CheckerboardDetection": "1.0",
+            "ScenePreview": "1.0",
+            "Meshing": "7.0",
+            "PrepareDenseScene": "3.0",
+            "ImageMatching": "2.0",
+            "KeyframeSelection": "4.1",
+            "ConvertSfMFormat": "2.0",
             "ExportAnimatedCamera": "2.0",
-            "MeshDecimate": "1.0",
-            "ImageMatchingMultiSfM": "1.0",
-            "CheckerboardDetection": "1.0"
+            "FeatureMatching": "2.0",
+            "MeshFiltering": "3.0"
         }
     },
     "graph": {
@@ -49,7 +50,10 @@
                 200
             ],
             "inputs": {
-                "input": "{ApplyCalibration_1.output}"
+                "input": "{ApplyCalibration_1.output}",
+                "masksFolder": "{ImageSegmentation_1.output}",
+                "maskExtension": "exr",
+                "maskInvert": true
             },
             "internalInputs": {
                 "color": "#575963"
@@ -561,6 +565,19 @@
             "internalInputs": {
                 "color": "#575963"
             }
+        },
+        "ImageSegmentation_1": {
+            "nodeType": "ImageSegmentation",
+            "position": [
+                0,
+                200
+            ],
+            "inputs": {
+                "input": "{CameraInit_1.output}"
+            },
+            "internalInputs": {
+                "color": "#575963"
+            }
         }
     }
 }