Skip to content

Commit 554f9c0

Browse files
servantftransperfectservantftransperfect
authored
Merge pull request #2583 from alicevision/dev/updateTrackingPipelinesWithSplitSegmentation
Tracking pipelines segmentation update
2 parents c8a0008 + 66d2594 commit 554f9c0

File tree

5 files changed

+163
-105
lines changed

5 files changed

+163
-105
lines changed

‎meshroom/pipelines/cameraTracking.mg‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
"ExportDistortion": "1.0",
1616
"FeatureExtraction": "1.3",
1717
"FeatureMatching": "2.0",
18+
"ImageDetectionPrompt": "0.1",
1819
"ImageMatching": "2.0",
1920
"ImageMatchingMultiSfM": "1.0",
20-
"ImageSegmentationPrompt": "0.1",
21+
"ImageSegmentationBox": "0.1",
2122
"KeyframeSelection": "5.0",
2223
"MeshDecimate": "1.0",
2324
"MeshFiltering": "3.0",
@@ -174,12 +175,12 @@
174175
"FeatureExtraction_1": {
175176
"nodeType": "FeatureExtraction",
176177
"position": [
177-
200,
178+
400,
178179
200
179180
],
180181
"inputs": {
181182
"input": "{ApplyCalibration_1.output}",
182-
"masksFolder": "{ImageSegmentationPrompt_1.output}",
183+
"masksFolder": "{ImageSegmentationBox_1.output}",
183184
"maskExtension": "exr"
184185
},
185186
"internalInputs": {
@@ -236,6 +237,19 @@
236237
"color": "#80766f"
237238
}
238239
},
240+
"ImageDetectionPrompt_1": {
241+
"nodeType": "ImageDetectionPrompt",
242+
"position": [
243+
0,
244+
200
245+
],
246+
"inputs": {
247+
"input": "{CameraInit_1.output}"
248+
},
249+
"internalInputs": {
250+
"color": "#575963"
251+
}
252+
},
239253
"ImageMatchingMultiSfM_1": {
240254
"nodeType": "ImageMatchingMultiSfM",
241255
"position": [
@@ -292,14 +306,15 @@
292306
"color": "#80766f"
293307
}
294308
},
295-
"ImageSegmentationPrompt_1": {
296-
"nodeType": "ImageSegmentationPrompt",
309+
"ImageSegmentationBox_1": {
310+
"nodeType": "ImageSegmentationBox",
297311
"position": [
298-
0,
312+
200,
299313
200
300314
],
301315
"inputs": {
302-
"input": "{CameraInit_1.output}",
316+
"input": "{ImageDetectionPrompt_1.input}",
317+
"bboxFolder": "{ImageDetectionPrompt_1.output}",
303318
"maskInvert": true,
304319
"keepFilename": true
305320
},
@@ -316,9 +331,6 @@
316331
"inputs": {
317332
"inputPaths": [
318333
"{ApplyCalibration_1.output}"
319-
],
320-
"maskPaths": [
321-
"{ImageSegmentationPrompt_1.output}"
322334
]
323335
},
324336
"internalInputs": {
@@ -379,9 +391,6 @@
379391
],
380392
"inputs": {
381393
"input": "{SfMTriangulation_1.output}",
382-
"masksFolders": [
383-
"{ImageSegmentationPrompt_1.output}"
384-
],
385394
"maskExtension": "exr"
386395
},
387396
"internalInputs": {
@@ -391,8 +400,8 @@
391400
"Publish_1": {
392401
"nodeType": "Publish",
393402
"position": [
394-
3574,
395-
166
403+
3600,
404+
100
396405
],
397406
"inputs": {
398407
"inputFiles": [
@@ -413,7 +422,7 @@
413422
"cameras": "{ConvertSfMFormat_1.output}",
414423
"model": "{MeshDecimate_1.output}",
415424
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
416-
"masks": "{ImageSegmentationPrompt_1.output}"
425+
"masks": "{ImageSegmentationBox_1.output}"
417426
},
418427
"internalInputs": {
419428
"color": "#4c594c"

‎meshroom/pipelines/cameraTrackingWithoutCalibration.mg‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
"ExportDistortion": "1.0",
1515
"FeatureExtraction": "1.3",
1616
"FeatureMatching": "2.0",
17+
"ImageDetectionPrompt": "0.1",
1718
"ImageMatching": "2.0",
1819
"ImageMatchingMultiSfM": "1.0",
19-
"ImageSegmentationPrompt": "0.1",
20+
"ImageSegmentationBox": "0.1",
2021
"KeyframeSelection": "5.0",
2122
"MeshDecimate": "1.0",
2223
"MeshFiltering": "3.0",
@@ -145,12 +146,12 @@
145146
"FeatureExtraction_1": {
146147
"nodeType": "FeatureExtraction",
147148
"position": [
148-
200,
149+
400,
149150
200
150151
],
151152
"inputs": {
152153
"input": "{ApplyCalibration_1.output}",
153-
"masksFolder": "{ImageSegmentationPrompt_1.output}",
154+
"masksFolder": "{ImageSegmentationBox_1.output}",
154155
"maskExtension": "exr"
155156
},
156157
"internalInputs": {
@@ -207,6 +208,19 @@
207208
"color": "#80766f"
208209
}
209210
},
211+
"ImageDetectionPrompt_1": {
212+
"nodeType": "ImageDetectionPrompt",
213+
"position": [
214+
0,
215+
200
216+
],
217+
"inputs": {
218+
"input": "{CameraInit_1.output}"
219+
},
220+
"internalInputs": {
221+
"color": "#575963"
222+
}
223+
},
210224
"ImageMatchingMultiSfM_1": {
211225
"nodeType": "ImageMatchingMultiSfM",
212226
"position": [
@@ -263,14 +277,15 @@
263277
"color": "#80766f"
264278
}
265279
},
266-
"ImageSegmentationPrompt_1": {
267-
"nodeType": "ImageSegmentationPrompt",
280+
"ImageSegmentationBox_1": {
281+
"nodeType": "ImageSegmentationBox",
268282
"position": [
269-
0,
283+
200,
270284
200
271285
],
272286
"inputs": {
273-
"input": "{CameraInit_1.output}",
287+
"input": "{ImageDetectionPrompt_1.input}",
288+
"bboxFolder": "{ImageDetectionPrompt_1.output}",
274289
"maskInvert": true,
275290
"keepFilename": true
276291
},
@@ -287,9 +302,6 @@
287302
"inputs": {
288303
"inputPaths": [
289304
"{ApplyCalibration_1.output}"
290-
],
291-
"maskPaths": [
292-
"{ImageSegmentationPrompt_1.output}"
293305
]
294306
},
295307
"internalInputs": {
@@ -350,9 +362,6 @@
350362
],
351363
"inputs": {
352364
"input": "{SfMTriangulation_1.output}",
353-
"masksFolders": [
354-
"{ImageSegmentationPrompt_1.output}"
355-
],
356365
"maskExtension": "exr"
357366
},
358367
"internalInputs": {
@@ -362,8 +371,8 @@
362371
"Publish_1": {
363372
"nodeType": "Publish",
364373
"position": [
365-
3574,
366-
166
374+
3600,
375+
100
367376
],
368377
"inputs": {
369378
"inputFiles": [
@@ -384,7 +393,7 @@
384393
"cameras": "{ConvertSfMFormat_1.output}",
385394
"model": "{MeshDecimate_1.output}",
386395
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
387-
"masks": "{ImageSegmentationPrompt_1.output}"
396+
"masks": "{ImageSegmentationBox_1.output}"
388397
},
389398
"internalInputs": {
390399
"color": "#4c594c"

‎meshroom/pipelines/nodalCameraTracking.mg‎

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
"ExportDistortion": "1.0",
1414
"FeatureExtraction": "1.3",
1515
"FeatureMatching": "2.0",
16+
"ImageDetectionPrompt": "0.1",
1617
"ImageMatching": "2.0",
17-
"ImageSegmentationPrompt": "0.1",
18+
"ImageSegmentationBox": "0.1",
1819
"NodalSfM": "2.0",
1920
"Publish": "1.3",
2021
"RelativePoseEstimating": "2.0",
@@ -78,7 +79,7 @@
7879
"ConvertSfMFormat_1": {
7980
"nodeType": "ConvertSfMFormat",
8081
"position": [
81-
1400,
82+
1600,
8283
200
8384
],
8485
"inputs": {
@@ -108,7 +109,7 @@
108109
"ExportAnimatedCamera_1": {
109110
"nodeType": "ExportAnimatedCamera",
110111
"position": [
111-
1400,
112+
1600,
112113
0
113114
],
114115
"inputs": {
@@ -135,12 +136,12 @@
135136
"FeatureExtraction_1": {
136137
"nodeType": "FeatureExtraction",
137138
"position": [
138-
200,
139+
400,
139140
0
140141
],
141142
"inputs": {
142143
"input": "{ApplyCalibration_1.output}",
143-
"masksFolder": "{ImageSegmentationPrompt_1.output}"
144+
"masksFolder": "{ImageSegmentationBox_1.output}"
144145
},
145146
"internalInputs": {
146147
"color": "#80766f"
@@ -149,7 +150,7 @@
149150
"FeatureMatching_1": {
150151
"nodeType": "FeatureMatching",
151152
"position": [
152-
600,
153+
800,
153154
0
154155
],
155156
"inputs": {
@@ -162,10 +163,23 @@
162163
"color": "#80766f"
163164
}
164165
},
166+
"ImageDetectionPrompt_1": {
167+
"nodeType": "ImageDetectionPrompt",
168+
"position": [
169+
0,
170+
200
171+
],
172+
"inputs": {
173+
"input": "{CameraInit_1.output}"
174+
},
175+
"internalInputs": {
176+
"color": "#80766f"
177+
}
178+
},
165179
"ImageMatching_1": {
166180
"nodeType": "ImageMatching",
167181
"position": [
168-
400,
182+
600,
169183
0
170184
],
171185
"inputs": {
@@ -178,14 +192,15 @@
178192
"color": "#80766f"
179193
}
180194
},
181-
"ImageSegmentationPrompt_1": {
182-
"nodeType": "ImageSegmentationPrompt",
195+
"ImageSegmentationBox_1": {
196+
"nodeType": "ImageSegmentationBox",
183197
"position": [
184-
0,
198+
200,
185199
200
186200
],
187201
"inputs": {
188-
"input": "{CameraInit_1.output}",
202+
"input": "{ImageDetectionPrompt_1.input}",
203+
"bboxFolder": "{ImageDetectionPrompt_1.output}",
189204
"maskInvert": true,
190205
"keepFilename": true
191206
},
@@ -196,7 +211,7 @@
196211
"NodalSfM_1": {
197212
"nodeType": "NodalSfM",
198213
"position": [
199-
1200,
214+
1400,
200215
0
201216
],
202217
"inputs": {
@@ -211,7 +226,7 @@
211226
"Publish_1": {
212227
"nodeType": "Publish",
213228
"position": [
214-
1800,
229+
2000,
215230
0
216231
],
217232
"inputs": {
@@ -225,7 +240,7 @@
225240
"RelativePoseEstimating_1": {
226241
"nodeType": "RelativePoseEstimating",
227242
"position": [
228-
1000,
243+
1200,
229244
0
230245
],
231246
"inputs": {
@@ -240,14 +255,14 @@
240255
"ScenePreview_1": {
241256
"nodeType": "ScenePreview",
242257
"position": [
243-
1600,
258+
1800,
244259
200
245260
],
246261
"inputs": {
247262
"cameras": "{ConvertSfMFormat_1.output}",
248263
"model": "{NodalSfM_1.output}",
249264
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
250-
"masks": "{ImageSegmentationPrompt_1.output}",
265+
"masks": "{ImageSegmentationBox_1.output}",
251266
"pointCloudParams": {
252267
"particleSize": 0.001,
253268
"particleColor": "Red"
@@ -260,7 +275,7 @@
260275
"TracksBuilding_1": {
261276
"nodeType": "TracksBuilding",
262277
"position": [
263-
800,
278+
1000,
264279
0
265280
],
266281
"inputs": {

0 commit comments

Comments
 (0)