Skip to content

Commit

Permalink
Merge pull request #2583 from alicevision/dev/updateTrackingPipelines…
Browse files Browse the repository at this point in the history 
…WithSplitSegmentation

Tracking pipelines segmentation update
  • Loading branch information
@servantftechnicolor
servantftechnicolor authored Nov 5, 2024
2 parents c8a0008 + 66d2594 commit 554f9c0
Show file tree
Hide file tree
Showing 5 changed files with 163 additions and 105 deletions.
41 changes: 25 additions & 16 deletions meshroom/pipelines/cameraTracking.mg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
"ExportDistortion": "1.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "0.1",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.0",
"ImageSegmentationPrompt": "0.1",
"ImageSegmentationBox": "0.1",
"KeyframeSelection": "5.0",
"MeshDecimate": "1.0",
"MeshFiltering": "3.0",
Expand Down Expand Up @@ -174,12 +175,12 @@
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
200,
400,
200
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"masksFolder": "{ImageSegmentationPrompt_1.output}",
"masksFolder": "{ImageSegmentationBox_1.output}",
"maskExtension": "exr"
},
"internalInputs": {
Expand Down Expand Up @@ -236,6 +237,19 @@
"color": "#80766f"
}
},
"ImageDetectionPrompt_1": {
"nodeType": "ImageDetectionPrompt",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}"
},
"internalInputs": {
"color": "#575963"
}
},
"ImageMatchingMultiSfM_1": {
"nodeType": "ImageMatchingMultiSfM",
"position": [
Expand Down Expand Up @@ -292,14 +306,15 @@
"color": "#80766f"
}
},
"ImageSegmentationPrompt_1": {
"nodeType": "ImageSegmentationPrompt",
"ImageSegmentationBox_1": {
"nodeType": "ImageSegmentationBox",
"position": [
0,
200,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"input": "{ImageDetectionPrompt_1.input}",
"bboxFolder": "{ImageDetectionPrompt_1.output}",
"maskInvert": true,
"keepFilename": true
},
Expand All @@ -316,9 +331,6 @@
"inputs": {
"inputPaths": [
"{ApplyCalibration_1.output}"
],
"maskPaths": [
"{ImageSegmentationPrompt_1.output}"
]
},
"internalInputs": {
Expand Down Expand Up @@ -379,9 +391,6 @@
],
"inputs": {
"input": "{SfMTriangulation_1.output}",
"masksFolders": [
"{ImageSegmentationPrompt_1.output}"
],
"maskExtension": "exr"
},
"internalInputs": {
Expand All @@ -391,8 +400,8 @@
"Publish_1": {
"nodeType": "Publish",
"position": [
3574,
166
3600,
100
],
"inputs": {
"inputFiles": [
Expand All @@ -413,7 +422,7 @@
"cameras": "{ConvertSfMFormat_1.output}",
"model": "{MeshDecimate_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentationPrompt_1.output}"
"masks": "{ImageSegmentationBox_1.output}"
},
"internalInputs": {
"color": "#4c594c"
Expand Down
41 changes: 25 additions & 16 deletions meshroom/pipelines/cameraTrackingWithoutCalibration.mg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@
"ExportDistortion": "1.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "0.1",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.0",
"ImageSegmentationPrompt": "0.1",
"ImageSegmentationBox": "0.1",
"KeyframeSelection": "5.0",
"MeshDecimate": "1.0",
"MeshFiltering": "3.0",
Expand Down Expand Up @@ -145,12 +146,12 @@
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
200,
400,
200
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"masksFolder": "{ImageSegmentationPrompt_1.output}",
"masksFolder": "{ImageSegmentationBox_1.output}",
"maskExtension": "exr"
},
"internalInputs": {
Expand Down Expand Up @@ -207,6 +208,19 @@
"color": "#80766f"
}
},
"ImageDetectionPrompt_1": {
"nodeType": "ImageDetectionPrompt",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}"
},
"internalInputs": {
"color": "#575963"
}
},
"ImageMatchingMultiSfM_1": {
"nodeType": "ImageMatchingMultiSfM",
"position": [
Expand Down Expand Up @@ -263,14 +277,15 @@
"color": "#80766f"
}
},
"ImageSegmentationPrompt_1": {
"nodeType": "ImageSegmentationPrompt",
"ImageSegmentationBox_1": {
"nodeType": "ImageSegmentationBox",
"position": [
0,
200,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"input": "{ImageDetectionPrompt_1.input}",
"bboxFolder": "{ImageDetectionPrompt_1.output}",
"maskInvert": true,
"keepFilename": true
},
Expand All @@ -287,9 +302,6 @@
"inputs": {
"inputPaths": [
"{ApplyCalibration_1.output}"
],
"maskPaths": [
"{ImageSegmentationPrompt_1.output}"
]
},
"internalInputs": {
Expand Down Expand Up @@ -350,9 +362,6 @@
],
"inputs": {
"input": "{SfMTriangulation_1.output}",
"masksFolders": [
"{ImageSegmentationPrompt_1.output}"
],
"maskExtension": "exr"
},
"internalInputs": {
Expand All @@ -362,8 +371,8 @@
"Publish_1": {
"nodeType": "Publish",
"position": [
3574,
166
3600,
100
],
"inputs": {
"inputFiles": [
Expand All @@ -384,7 +393,7 @@
"cameras": "{ConvertSfMFormat_1.output}",
"model": "{MeshDecimate_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentationPrompt_1.output}"
"masks": "{ImageSegmentationBox_1.output}"
},
"internalInputs": {
"color": "#4c594c"
Expand Down
49 changes: 32 additions & 17 deletions meshroom/pipelines/nodalCameraTracking.mg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
"ExportDistortion": "1.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "0.1",
"ImageMatching": "2.0",
"ImageSegmentationPrompt": "0.1",
"ImageSegmentationBox": "0.1",
"NodalSfM": "2.0",
"Publish": "1.3",
"RelativePoseEstimating": "2.0",
Expand Down Expand Up @@ -78,7 +79,7 @@
"ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat",
"position": [
1400,
1600,
200
],
"inputs": {
Expand Down Expand Up @@ -108,7 +109,7 @@
"ExportAnimatedCamera_1": {
"nodeType": "ExportAnimatedCamera",
"position": [
1400,
1600,
0
],
"inputs": {
Expand All @@ -135,12 +136,12 @@
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
200,
400,
0
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"masksFolder": "{ImageSegmentationPrompt_1.output}"
"masksFolder": "{ImageSegmentationBox_1.output}"
},
"internalInputs": {
"color": "#80766f"
Expand All @@ -149,7 +150,7 @@
"FeatureMatching_1": {
"nodeType": "FeatureMatching",
"position": [
600,
800,
0
],
"inputs": {
Expand All @@ -162,10 +163,23 @@
"color": "#80766f"
}
},
"ImageDetectionPrompt_1": {
"nodeType": "ImageDetectionPrompt",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}"
},
"internalInputs": {
"color": "#80766f"
}
},
"ImageMatching_1": {
"nodeType": "ImageMatching",
"position": [
400,
600,
0
],
"inputs": {
Expand All @@ -178,14 +192,15 @@
"color": "#80766f"
}
},
"ImageSegmentationPrompt_1": {
"nodeType": "ImageSegmentationPrompt",
"ImageSegmentationBox_1": {
"nodeType": "ImageSegmentationBox",
"position": [
0,
200,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"input": "{ImageDetectionPrompt_1.input}",
"bboxFolder": "{ImageDetectionPrompt_1.output}",
"maskInvert": true,
"keepFilename": true
},
Expand All @@ -196,7 +211,7 @@
"NodalSfM_1": {
"nodeType": "NodalSfM",
"position": [
1200,
1400,
0
],
"inputs": {
Expand All @@ -211,7 +226,7 @@
"Publish_1": {
"nodeType": "Publish",
"position": [
1800,
2000,
0
],
"inputs": {
Expand All @@ -225,7 +240,7 @@
"RelativePoseEstimating_1": {
"nodeType": "RelativePoseEstimating",
"position": [
1000,
1200,
0
],
"inputs": {
Expand All @@ -240,14 +255,14 @@
"ScenePreview_1": {
"nodeType": "ScenePreview",
"position": [
1600,
1800,
200
],
"inputs": {
"cameras": "{ConvertSfMFormat_1.output}",
"model": "{NodalSfM_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentationPrompt_1.output}",
"masks": "{ImageSegmentationBox_1.output}",
"pointCloudParams": {
"particleSize": 0.001,
"particleColor": "Red"
Expand All @@ -260,7 +275,7 @@
"TracksBuilding_1": {
"nodeType": "TracksBuilding",
"position": [
800,
1000,
0
],
"inputs": {
Expand Down
Loading

0 comments on commit 554f9c0

Please sign in to comment.